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

client_linchunjie

2019-04-24 19ab2ad9d8550c39bc6d29c08100fb2f9bb24c27

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

 Fight/ClientCollectUtility.cs

@@ -131,10 +131,8 @@
                            continue;
                        }

                        if (_npc == null)
                        {
                            _npc = _a as GA_NpcClientCollect;
                        }
                        _npc = _a as GA_NpcClientCollect;
                        break;
                    }
                }
            }

 Fight/GameActor/GA_Hero.cs

@@ -84,9 +84,11 @@
    /// 用户点击锁定, 被攻击锁定攻击者...

    /// </summary>

    private GActor m_LockTarget;

    public GActor LockTarget {

    public GActor LockTarget

    {

        get { return m_LockTarget; }

        set {

        set

        {

            if (m_LockTarget == value)

            {

                return;

@@ -108,11 +110,14 @@
    public MapArea currentBossArea;



    private uint _atkBossID;

    public uint atkBossID {

        get {

    public uint atkBossID

    {

        get

        {

            return _atkBossID;

        }

        set {

        set

        {

            if (_atkBossID != value)

            {

                _atkBossID = value;

@@ -128,22 +133,28 @@
        }

    }



    public sealed override int NextAction {

        get {

    public sealed override int NextAction

    {

        get

        {

            return base.NextAction;

        }



        set {

        set

        {

            base.NextAction = value;

        }

    }



    public sealed override GActor SelectTarget {

        get {

    public sealed override GActor SelectTarget

    {

        get

        {

            return base.SelectTarget;

        }



        set {

        set

        {

            if (base.SelectTarget == value)

            {

                return;

@@ -736,8 +747,10 @@
    }



    private HeavenBattleModel m_HeavenBattleModel = null;

    public HeavenBattleModel heavenBattleModel {

        get {

    public HeavenBattleModel heavenBattleModel

    {

        get

        {

            return m_HeavenBattleModel ?? (m_HeavenBattleModel = ModelCenter.Instance.GetModel<HeavenBattleModel>());

        }

    }

@@ -830,11 +843,14 @@
    #region 地图区域相关处理



    private int m_CurMapArea = 1 << (int)MapArea.E_Type.Normal;

    public int CurMapArea {

        get {

    public int CurMapArea

    {

        get

        {

            return m_CurMapArea;

        }

        set {

        set

        {

            m_CurMapArea = value;

        }

    }


 Fight/Stage/Dungeon/DungeonStage.cs

@@ -137,6 +137,8 @@
        {

            PlayerDatas.Instance.hero.atkBossID = 0;

            PlayerDatas.Instance.hero.currentBossArea = null;

            PlayerDatas.Instance.hero.SelectTarget = null;

            PlayerDatas.Instance.hero.LockTarget = null;

        }



        if (CameraController.Instance != null)