少年修仙传客户端代码仓库
client_linchunjie
2018-12-06 7fbabc2f27b5c6416374b26a4dc9f098a0601fdc
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
7个文件已修改
54 ■■■■ 已修改文件
Fight/GameActor/GAMgr.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GA_Hero.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActorNpcNoFight.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActorPlayerBase.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FindPrecious/DemonJarAutoChallenge.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/SelectBoxItemCell.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/SystemSetting/SystemSetWin.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GAMgr.cs
@@ -104,13 +104,10 @@
    {
        List<GActor> _list = GetTypeList(E_ActorClassType.Pet);
        if (_list == null || _list.Count == 0)
        {
            return;
        }
        //Debug.LogFormat("共有: {0} 只宠物", _petList.Count);
        GA_Player _player = null;
        if (_list != null && _list.Count > 0)
        {
            //Debug.LogFormat("共有: {0} 只宠物", _petList.Count);
        foreach (var _pet in _list)
        {
            var _parentID = _pet.ActorInfo.ownerSID;
@@ -139,9 +136,11 @@
                //Debug.LogFormat("宠物: {0} 的拥有者: {1} 在列表中且位于: {2}, 大于限制数量: {3}", _pet.ServerInstID, _parentID, _index, BattleEffectPlayRule.Instance.petLimit);
            }
        }
        }
        _list = GetTypeList(E_ActorClassType.Player);
        if (_list != null && _list.Count > 0)
        {
        //Debug.LogFormat("共有: {0} 只守护", _list.Count);
        foreach (var _chkPlayer in _list)
        {
@@ -166,6 +165,7 @@
            }
        }
    }
    }
    public void AddOffLinePlayer(uint sid)
    {
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,6 +63,8 @@
        for (var i = 0; i < bossIds.Count; i++)
        {
            var bossId = bossIds[i];
            if (findPreciousModel.IsBossSubscribed(bossId))
            {
            if (Config.Instance.ContainKey<DemonJarConfig>(bossId))
            {
                var alive = findPreciousModel.IsBossAlive(bossId);
@@ -72,6 +74,7 @@
                }
            }
        }
        }
    }
System/KnapSack/Logic/SelectBoxItemCell.cs
@@ -35,6 +35,10 @@
            nameText.text = itemConfig.ItemName;
            ItemCellModel cellModel = new ItemCellModel(id, false, (ulong)BoxModel.selectDict[id]);
            itemBaisc.Init(cellModel);
            if (itemConfig.Effect1 == 220)
            {
                id = itemConfig.EffectValueA1;
            }
            int haveCnt = playerPack.GetItemCountByID(PackType.rptItem, id);
            if(haveCnt <= 0)
            {
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);
                }
            }