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

client_Wu Xijin

2018-09-22 babf2c9be98ca1f3fe6b44026acf54b78858ac4b

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

 Fight/GameActor/BattleEffectPlayRule.cs

@@ -41,8 +41,18 @@
                GActor _actor1 = GAMgr.Instance.GetBySID(id1);
                GActor _actor2 = GAMgr.Instance.GetBySID(id2);

                float _dis1 = MathUtility.DistanceSqrtXZ(_hero.Pos, _actor1.Pos);
                float _dis2 = MathUtility.DistanceSqrtXZ(_hero.Pos, _actor2.Pos);
                float _dis1 = 0f;
                float _dis2 = 0f;
                
                if (_actor1 != null)
                {
                    _dis1 = MathUtility.DistanceSqrtXZ(_hero.Pos, _actor1.Pos);
                }

                if (_actor2 != null)
                {
                    _dis2 = MathUtility.DistanceSqrtXZ(_hero.Pos, _actor2.Pos);
                }

                return _dis2 > _dis1 ? -1 : 1;
            });
@@ -62,8 +72,15 @@
        // 选中英雄必显示
        if (_hero.SelectTarget != null)
        {
            if (_hero.SelectTarget.ServerInstID == sid
             || _hero.LockTarget.ServerInstID == sid)
            if (_hero.SelectTarget.ServerInstID == sid)
            {
                return true;
            }
        }

        if (_hero.LockTarget != null)
        {
            if (_hero.LockTarget.ServerInstID == sid)
            {
                return true;
            }

 System/WindowJump/WindowJumpMgr.cs

@@ -705,6 +705,7 @@
                SetJumpLogic<TreasureLevelUpWin>(0);

                break;

            case JumpUIType.Kylin:

                dungeonModel.currentDungeon = new Dungeon(31190, 0);

                SetJumpLogic<MultipleDifficultyDungeonWin>(0);

                break;

            case JumpUIType.Kylin1: