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

client_linchunjie

2018-12-06 7fbabc2f27b5c6416374b26a4dc9f098a0601fdc

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

 Fight/GameActor/GAMgr.cs

@@ -104,65 +104,65 @@
    {

        List<GActor> _list = GetTypeList(E_ActorClassType.Pet);



        if (_list == null || _list.Count == 0)

        {

            return;

        }



        //Debug.LogFormat("共有: {0} 只宠物", _petList.Count);

        GA_Player _player = null;

        foreach (var _pet in _list)

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

        {

            var _parentID = _pet.ActorInfo.ownerSID;

            if (_parentID == PlayerDatas.Instance.PlayerId)

            //Debug.LogFormat("共有: {0} 只宠物", _petList.Count);

            foreach (var _pet in _list)

            {

                continue;

            }

                var _parentID = _pet.ActorInfo.ownerSID;

                if (_parentID == PlayerDatas.Instance.PlayerId)

                {

                    continue;

                }



            _player = GetBySID(_parentID) as GA_Player;

            if (_player == null || !_player.ShowOrHide)

            {

                _pet.ShowOrHideModel(false);

                //Debug.LogFormat("宠物: {0} 的拥有者: {1} 不可见, 这里隐藏.", _pet.ServerInstID, _parentID);

                continue;

            }

                _player = GetBySID(_parentID) as GA_Player;

                if (_player == null || !_player.ShowOrHide)

                {

                    _pet.ShowOrHideModel(false);

                    //Debug.LogFormat("宠物: {0} 的拥有者: {1} 不可见, 这里隐藏.", _pet.ServerInstID, _parentID);

                    continue;

                }



            var _index = BattleEffectPlayRule.Instance.GetIndex(_parentID);

            if (_index != -1 && _index < BattleEffectPlayRule.Instance.petLimit)

            {

                _pet.ShowOrHideModel(true);

                //Debug.LogFormat("宠物: {0} 的拥有者: {1} 在列表中且位于: {2}, 小于限制数量: {3}", _pet.ServerInstID, _parentID, _index, BattleEffectPlayRule.Instance.petLimit);

            }

            else

            {

                _pet.ShowOrHideModel(false);

                //Debug.LogFormat("宠物: {0} 的拥有者: {1} 在列表中且位于: {2}, 大于限制数量: {3}", _pet.ServerInstID, _parentID, _index, BattleEffectPlayRule.Instance.petLimit);

                var _index = BattleEffectPlayRule.Instance.GetIndex(_parentID);

                if (_index != -1 && _index < BattleEffectPlayRule.Instance.petLimit)

                {

                    _pet.ShowOrHideModel(true);

                    //Debug.LogFormat("宠物: {0} 的拥有者: {1} 在列表中且位于: {2}, 小于限制数量: {3}", _pet.ServerInstID, _parentID, _index, BattleEffectPlayRule.Instance.petLimit);

                }

                else

                {

                    _pet.ShowOrHideModel(false);

                    //Debug.LogFormat("宠物: {0} 的拥有者: {1} 在列表中且位于: {2}, 大于限制数量: {3}", _pet.ServerInstID, _parentID, _index, BattleEffectPlayRule.Instance.petLimit);

                }

            }

        }



        _list = GetTypeList(E_ActorClassType.Player);



        //Debug.LogFormat("共有: {0} 只守护", _list.Count);

        foreach (var _chkPlayer in _list)

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

        {

            _player = _chkPlayer as GA_Player;

            if (_chkPlayer == null || !_chkPlayer.ShowOrHide)

            //Debug.LogFormat("共有: {0} 只守护", _list.Count);

            foreach (var _chkPlayer in _list)

            {

                _player.SwitchGuard(0);

                //Debug.LogFormat("_list: {0} 的拥有者: {1} 不可见, 这里隐藏.", _chkPlayer.ServerInstID, _player.ServerInstID);

                continue;

            }

                _player = _chkPlayer as GA_Player;

                if (_chkPlayer == null || !_chkPlayer.ShowOrHide)

                {

                    _player.SwitchGuard(0);

                    //Debug.LogFormat("_list: {0} 的拥有者: {1} 不可见, 这里隐藏.", _chkPlayer.ServerInstID, _player.ServerInstID);

                    continue;

                }



            var _index = BattleEffectPlayRule.Instance.GetIndex(_player.ServerInstID);

            if (_index != -1 && _index < BattleEffectPlayRule.Instance.petLimit)

            {

                _player.SwitchGuard((uint)_player.serverGuardId);

                //Debug.LogFormat("_list: {0} 的拥有者: {1} 在列表中且位于: {2}, 小于限制数量: {3}", _chkPlayer.ServerInstID, _player.ServerInstID, _index, BattleEffectPlayRule.Instance.petLimit);

            }

            else

            {

                _player.SwitchGuard(0);

                //Debug.LogFormat("_list: {0} 的拥有者: {1} 在列表中且位于: {2}, 大于限制数量: {3}", _chkPlayer.ServerInstID, _player.ServerInstID, _index, BattleEffectPlayRule.Instance.petLimit);

                var _index = BattleEffectPlayRule.Instance.GetIndex(_player.ServerInstID);

                if (_index != -1 && _index < BattleEffectPlayRule.Instance.petLimit)

                {

                    _player.SwitchGuard((uint)_player.serverGuardId);

                    //Debug.LogFormat("_list: {0} 的拥有者: {1} 在列表中且位于: {2}, 小于限制数量: {3}", _chkPlayer.ServerInstID, _player.ServerInstID, _index, BattleEffectPlayRule.Instance.petLimit);

                }

                else

                {

                    _player.SwitchGuard(0);

                    //Debug.LogFormat("_list: {0} 的拥有者: {1} 在列表中且位于: {2}, 大于限制数量: {3}", _chkPlayer.ServerInstID, _player.ServerInstID, _index, BattleEffectPlayRule.Instance.petLimit);

                }

            }

        }

    }


 Fight/GameActor/GA_Hero.cs

@@ -414,6 +414,15 @@
    protected sealed override void OnFixedUpdate()

    {

        base.OnFixedUpdate();



        if(IsRushing)

        {

            m_RushTime += Time.deltaTime;

            if(m_RushTime > 2)

            {

                StopRush();

            }

        }

    }



    protected sealed override void OnLateUpdate()


 Fight/GameActor/GActorNpcNoFight.cs

@@ -95,16 +95,27 @@
            {

                GameObject _prefab = InstanceResourcesLoader.LoadNpc(NpcConfig.NPCID);

                GameObjectPoolManager.Instance.ReleaseGameObject(_prefab, m_Model);



                if (NpcConfig.MODE.Contains("A_Zs") || NpcConfig.MODE.Contains("A_Fs"))

                {

                    var _renderer = m_Model.GetComponentInChildren<SkinnedMeshRenderer>();

                    if (_renderer)

                    {

                        MaterialLoader.Release(_renderer.material);

                        _renderer.material = _renderer.sharedMaterial = null;

                        _renderer.materials = _renderer.sharedMaterials = new Material[0];

                    }

                }

            }

        }



        m_Model = null;



        if (m_AppearEffect)

        {

            SFXPlayUtility.Instance.Release(m_AppearEffect);

            m_AppearEffect = null;

        }



        m_Model = null;



        if (m_Animator)

        {


 Fight/GameActor/GActorPlayerBase.cs

@@ -2258,6 +2258,7 @@
    protected float m_LastRushTime;

    private SFXController m_RushEffect;

    private float m_GhostCreateInterval;

    protected float m_RushTime;



    public void StartRush()

    {

@@ -2265,7 +2266,7 @@
        {

            return;

        }



        m_RushTime = 0;

        m_IsRushing = true;



        if (m_HorseModel)


 System/FindPrecious/DemonJarAutoChallenge.cs

@@ -63,12 +63,15 @@
        for (var i = 0; i < bossIds.Count; i++)
        {
            var bossId = bossIds[i];
            if (Config.Instance.ContainKey<DemonJarConfig>(bossId))
            if (findPreciousModel.IsBossSubscribed(bossId))
            {
                var alive = findPreciousModel.IsBossAlive(bossId);
                if (alive)
                if (Config.Instance.ContainKey<DemonJarConfig>(bossId))
                {
                    findPreciousModel.AutoGotoSkillDemonJarBoss(new FindPreciousModel.BossNotify(bossId, true));
                    var alive = findPreciousModel.IsBossAlive(bossId);
                    if (alive)
                    {
                        findPreciousModel.AutoGotoSkillDemonJarBoss(new FindPreciousModel.BossNotify(bossId, true));
                    }
                }
            }
        }

 System/KnapSack/Logic/SelectBoxItemCell.cs

@@ -35,7 +35,11 @@
            nameText.text = itemConfig.ItemName;

            ItemCellModel cellModel = new ItemCellModel(id, false, (ulong)BoxModel.selectDict[id]);

            itemBaisc.Init(cellModel);

            int haveCnt = playerPack.GetItemCountByID(PackType.rptItem, id);

            if (itemConfig.Effect1 == 220)

            {

                id = itemConfig.EffectValueA1;

            }

            int haveCnt = playerPack.GetItemCountByID(PackType.rptItem,id);

            if(haveCnt <= 0)

            {

                haveCnt = ModelCenter.Instance.GetModel<RuneModel>().GetRuneCountById(id);


 System/SystemSetting/SystemSetWin.cs

@@ -156,7 +156,7 @@
                SystemSetting.Instance.SetQualityLevel(GameQuality.High);

                if (isInited)

                {

                    SystemSetting.Instance.SetPlayerSyncCount(15);

                    SystemSetting.Instance.SetPlayerSyncCount(10);

                }

            }



@@ -170,7 +170,7 @@
                SystemSetting.Instance.SetQualityLevel(GameQuality.Medium);

                if (isInited)

                {

                    SystemSetting.Instance.SetPlayerSyncCount(10);

                    SystemSetting.Instance.SetPlayerSyncCount(5);

                }

            }



@@ -185,7 +185,7 @@
                if (isInited)

                {

                    SystemSetting.Instance.SetGameFps(GameFps.Half);

                    SystemSetting.Instance.SetPlayerSyncCount(5);

                    SystemSetting.Instance.SetPlayerSyncCount(3);

                }

            }