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

client_Wu Xijin

2019-04-16 e74178266e50d14b11ba40ad6d9c25bb3ae02173

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

 Core/NetworkPackage/ClientPack/ClientToMapServer/CA2_Interaction/CA202_tagCMSelectObj.cs

New file
@@ -0,0 +1,25 @@
using UnityEngine;
using System.Collections;

//A2 02通知选中对象 # tagCMSelectObj

public class CA202_tagCMSelectObj : GameNetPackBasic
{
    public byte isSelect;    //0 不选中
    public byte Type;    //目标类型
    public uint ID;    //ID

    public CA202_tagCMSelectObj()
    {
        combineCmd = (ushort)0x03FE;
        _cmd = (ushort)0xA202;
    }

    public override void WriteToBytes()
    {
        WriteBytes(isSelect, NetDataType.BYTE);
        WriteBytes(Type, NetDataType.BYTE);
        WriteBytes(ID, NetDataType.DWORD);
    }

}

 Core/NetworkPackage/ClientPack/ClientToMapServer/CA2_Interaction/CA202_tagCMSelectObj.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: fbbd0a74db4e14a428e1a0fc7c69386b
timeCreated: 1555406256
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Fight/Actor/HeroBehaviour.cs

@@ -393,10 +393,12 @@
                }

            }

        }

        if (PreFightMission.Instance.IsFinished() == false)



        if (PlayerDatas.Instance.baseData.AttackMode == (byte)E_AttackMode.Contest)

        {

            _hitTestLimit = 10;

            _hitTestLimit = 1;

        }



        E_SkillCastType _castType = (E_SkillCastType)(skill.skillInfo.config.Tag % 10);

        E_SkillCastTarget _targetType = (E_SkillCastTarget)(skill.skillInfo.config.Tag / 10);




 Fight/GameActor/GA_Hero.cs

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

    /// </summary>

    private GActor m_LockTarget;

    public GActor LockTarget {

    public GActor LockTarget

    {

        get { return m_LockTarget; }

        set {

        set

        {

            if (m_LockTarget == value)

            {

                return;

@@ -89,11 +91,14 @@
    public MapArea currentBossArea;



    private uint _atkBossID;

    public uint atkBossID {

        get {

    public uint atkBossID

    {

        get

        {

            return _atkBossID;

        }

        set {

        set

        {

            if (_atkBossID != value)

            {

                _atkBossID = value;

@@ -109,22 +114,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;

@@ -144,6 +155,30 @@
            }



            base.SelectTarget = value;



            if (PlayerDatas.Instance.baseData.AttackMode == (byte)E_AttackMode.Contest)

            {

                var _pkg = new CA202_tagCMSelectObj();

                if (value == null)

                {

                    _pkg.isSelect = 0;

                }

                else

                {

                    _pkg.isSelect = 1;

                    _pkg.ID = value.ServerInstID;

                    _pkg.Type = (byte)value.ActorType;

                }



                if (CrossServerUtility.IsCrossServer())

                {

                    GameNetSystem.Instance.SendToCrossServer(_pkg);

                }

                else

                {

                    GameNetSystem.Instance.SendInfo(_pkg);

                }

            }

        }

    }



@@ -659,8 +694,10 @@
    }



    private HeavenBattleModel m_HeavenBattleModel = null;

    public HeavenBattleModel heavenBattleModel {

        get {

    public HeavenBattleModel heavenBattleModel

    {

        get

        {

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

        }

    }

@@ -753,11 +790,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/GameActor/GA_NpcClientCollect.cs

@@ -108,8 +108,16 @@

        if (_chkDistSqrt < 4)
        {
            var _model = ModelCenter.Instance.GetModel<HazyGrassModel>();
            if (_model.CanCollectClientNpc(NpcConfig.NPCID))
            {
            StartCollect();
        }
            else
            {
                _model.DisplayCollectErrorTip();
            }
        }
    }

    private bool m_StartCollect;

 System/HazyRegion/HazyGrassModel.cs

@@ -166,6 +166,11 @@
            return true;

        }



        public void DisplayCollectErrorTip()

        {

            SysNotifyMgr.Instance.ShowTip("HazyGrassCollectError");

        }



        public void ReceivePackage(HA714_tagMCNPCCntList package)

        {

            if (package.MapID != ReikiGrassMapId