少年修仙传客户端代码仓库
client_Wu Xijin
2018-10-11 3b59ef9035d99396e7f52670361a530353845e80
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
41 ■■■■■ 已修改文件
Fight/Actor/Status/Status_Polymorph.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActorNpcFight.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActorPlayerBase.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/Status/Status_Polymorph.cs
@@ -49,7 +49,36 @@
        if (_actor != null)
        {
            _actor.Polymorph(false);
            var _config = Config.Instance.Get<TableConfig.SkillConfig>(h0605.SkillID);
            int _npcID = 0;
            if (_config.Effect1 == 1063)
            {
                _npcID = _config.EffectValue11;
            }
            else if (_config.Effect2 == 1063)
            {
                _npcID = _config.EffectValue21;
            }
            else if (_config.Effect3 == 1063)
            {
                _npcID = _config.EffectValue31;
            }
            else if (_config.Effect4 == 1063)
            {
                _npcID = _config.EffectValue41;
            }
            else if (_config.Effect5 == 1063)
            {
                _npcID = _config.EffectValue51;
            }
            else if (_config.Effect6 == 1063)
            {
                _npcID = _config.EffectValue61;
            }
            _actor.Polymorph(false, _npcID);
        }
    }
}
Fight/GameActor/GActorNpcFight.cs
@@ -773,13 +773,19 @@
        {
            if (m_SheepModel)
            {
                var _a = m_SheepModel.GetComponent<Animator>();
                if (_a)
                {
                    _a.enabled = false;
                }
                if (m_SheepIsDefaultNpc)
                {
                    GameObjectPoolManager.Instance.ReleaseDefaultFightNPC(m_SheepModel);
                }
                else
                {
                    var _prefab = InstanceResourcesLoader.LoadNpc(10101001);
                    var _prefab = InstanceResourcesLoader.LoadNpc(npcID);
                    GameObjectPoolManager.Instance.ReleaseGameObject(_prefab, m_SheepModel);
                }
            }
Fight/GameActor/GActorPlayerBase.cs
@@ -151,7 +151,7 @@
                }
                else
                {
                    var _prefab = InstanceResourcesLoader.LoadNpc(10101001);
                    var _prefab = InstanceResourcesLoader.LoadNpc(npcID);
                    GameObjectPoolManager.Instance.ReleaseGameObject(_prefab, m_SheepModel);
                }
            }