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

client_Wu Xijin

2019-01-25 8352dbfb0c4fd979a930a78bd27656eb0299ed39

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

 Fight/Actor/HeroBehaviour.cs

@@ -150,15 +150,10 @@
            }

            _data.defaultSkillID = m_WillUsedSkillID;

            m_Hero.aiHandler.currentType = E_HeroAIType.KillUntilDie;

            if (AI_BossDSX.GetStep() == 1)



            if (OnUserClickSkill != null)

            {

                if (m_WillUsedSkillID == 190)

                {

                    if (OnUserClickSkill != null)

                    {

                        OnUserClickSkill(m_WillUsedSkillID);

                    }

                }

                OnUserClickSkill(m_WillUsedSkillID);

            }

        }

        else


 Fight/GameActor/GA_Hero.cs

@@ -387,7 +387,7 @@
                SelectTarget = null;

            }



            if (LockTarget is GActorNpcFight)

            if (LockTarget is GActorNpcFight || LockTarget == null)

            {

                var _list = GAMgr.Instance.GetTypeList(E_ActorClassType.Player);

                if (_list != null && _list.Count > 0)


 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -641,6 +641,8 @@
            {

                crossDayAwardsRedpoint.state = RedPointState.None;

            }



            CrossServerUtility.UpdateCrossServerRedpoint();

        }



        public void UpdateCrossMatchRedpoint()

@@ -747,6 +749,8 @@
                    }

                }

            }



            CrossServerUtility.UpdateCrossServerRedpoint();

        }



        public bool TryGetRedTypeByShopId(int shopId, out int type)


 System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs

@@ -393,6 +393,8 @@
        {

            redPointStre1.state = RedPointState.None;

        }



        CrossServerUtility.UpdateCrossServerRedpoint();

    }



    private void RedPointSea()//赛季奖励红点

@@ -422,6 +424,7 @@
        {

            redPointStre2.state = RedPointState.None;

        }

        CrossServerUtility.UpdateCrossServerRedpoint();

    }



    private static int m_PkType = 0;


 System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs

@@ -73,6 +73,13 @@
                        effect.Play();

                    }

                }

                else

                {

                    if (effect.IsPlaying)

                    {

                        effect.Stop();

                    }

                }

            }

        }

    }


 System/KnapSack/BetterItemGetBehaviour.cs

@@ -157,7 +157,8 @@
            if (model.TryGetBetterEquip(model.currentEquipGuid, out betterEquip))

            {

                var itemConfig = Config.Instance.Get<ItemConfig>(betterEquip.itemInfo.ItemID);

                itemTipsModel.SetItemTipsModel(PackType.rptItem, betterEquip.itemInfo.ItemGUID);

                var packType = GeneralDefine.GetPackTypeByItemType(itemConfig.Type);

                itemTipsModel.SetItemTipsModel(packType, betterEquip.itemInfo.ItemGUID);

            }

        }




 System/KnapSack/Logic/PackModelInterface.cs

@@ -1681,15 +1681,27 @@
                        putOnModel2 = playerPack.GetItemModelByIndex(PackType.rptJadeDynastyEquip, (int)RoleEquipType.JadeDynasty_Ring2);

                        break;

                }

                if (putOnModel2 != null)



                switch ((RoleEquipType)chinItemModel.EquipPlace)

                {

                    if (putOnModel != null)

                    {

                        if (putOnModel2.equipScore < putOnModel.equipScore)

                    case RoleEquipType.retFairyCan:

                    case RoleEquipType.JadeDynasty_Glove1:

                    case RoleEquipType.JadeDynasty_Ring1:

                        if (putOnModel2 != null)

                        {

                            if (putOnModel != null)

                            {

                                if (putOnModel2.equipScore < putOnModel.equipScore)

                                {

                                    putOnModel = putOnModel2;

                                }

                            }

                        }

                        else

                        {

                            putOnModel = putOnModel2;

                        }

                    }

                        break;

                }



                int equipScore1 = 0;