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

client_linchunjie

2019-07-16 7e94d4721b6d79361897ae46cc7c75cdc6e06da8

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

 Fight/GameActor/Bhv_FindEnemy.cs

@@ -165,6 +165,7 @@


        if (PlayerDatas.Instance.baseData.AttackMode == (int)E_AttackMode.All

         || PlayerDatas.Instance.baseData.AttackMode == (int)E_AttackMode.Family

         || PlayerDatas.Instance.baseData.AttackMode == (int)E_AttackMode.Contest

         || PlayerDatas.Instance.maliciousAtkPlayer.Count > 0)

        {

            //Debug.LogFormat("当前模式: {0}, 开始搜索Player对象...", (E_AttackMode)PlayerDatas.Instance.baseData.AttackMode);


 Fight/GameActor/GAMgr.cs

@@ -1450,6 +1450,7 @@
        // 全体模式, 强制模式 需要对玩家进行预先判断

        if ((E_AttackMode)PlayerDatas.Instance.baseData.AttackMode == E_AttackMode.All

         || (E_AttackMode)PlayerDatas.Instance.baseData.AttackMode == E_AttackMode.Family

         || (E_AttackMode)PlayerDatas.Instance.baseData.AttackMode == E_AttackMode.Contest

         || PlayerDatas.Instance.maliciousAtkPlayer.Count > 0

         || ClientCrossServerOneVsOne.isClientCrossServerOneVsOne)

        {


 Fight/GameActor/GA_Player.cs

@@ -605,7 +605,8 @@
        {

            return false;

        }

        else if ((E_AttackMode)PlayerDatas.Instance.baseData.AttackMode == E_AttackMode.All)

        else if ((E_AttackMode)PlayerDatas.Instance.baseData.AttackMode == E_AttackMode.All

              || (E_AttackMode)PlayerDatas.Instance.baseData.AttackMode == E_AttackMode.Contest)

        {

            return true;

        }


 Fight/Stage/Dungeon/MapArea.cs

@@ -36,8 +36,12 @@
#endif

        MapArea _area = _go.AddMissingComponent<MapArea>();



        _area.startPosition = new Vector3(config.StartPosX * .5f, 0, config.StartPosY * .5f);

        _area.endPosition = new Vector3(config.EndPosX * .5f, 0, config.EndPosY * .5f);

        _area.startPosition = new Vector3((config.StartPosX - GA_Hero.MapOffset.x) * .5f,

                                           0,

                                          (config.StartPosY - GA_Hero.MapOffset.z) * .5f);

        _area.endPosition = new Vector3((config.EndPosX - GA_Hero.MapOffset.x) * .5f,

                                        0,

                                        (config.EndPosY - GA_Hero.MapOffset.z) * .5f);



        int _width;

        int _height;


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -297,10 +297,10 @@


            if (!onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID))//前四只Boss和活动Boss特殊处理

            {

                if (IsBossBool && atkInt.Count > 1 && Buffmodel.PkType != 5)

                if (IsBossBool && atkInt.Count > 1 && Buffmodel.PkType != 7)

                {

                    onMainModel.AreaState = Buffmodel.PkType;

                    DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);

                    DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)7);

                }

            }

        }