少年修仙传客户端代码仓库
client_Hale
2018-12-04 6d5c76b2d629fe5fb1357a8755892d50ad87c721
5224
5个文件已修改
130 ■■■■■ 已修改文件
Fight/GameActor/BattleEffectPlayRule.cs 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GAMgr.cs 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GA_Pet.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActorNpcFight.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GeneralConfig/GeneralDefine.cs 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/BattleEffectPlayRule.cs
@@ -13,15 +13,53 @@
        {
            if (SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.High)
            {
                return GeneralDefine.highQualityCount;
                return GeneralDefine.highQualityEffectCount;
            }
            else if (SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.Medium)
            {
                return GeneralDefine.medQualityCount;
                return GeneralDefine.medQualityEffectCount;
            }
            else
            {
                return GeneralDefine.lowQualityCount;
                return GeneralDefine.lowQualityEffectCount;
            }
        }
    }
    public int petLimit
    {
        get
        {
            if (SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.High)
            {
                return GeneralDefine.highQualityPetCount;
            }
            else if (SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.Medium)
            {
                return GeneralDefine.medQualityPetCount;
            }
            else
            {
                return GeneralDefine.lowQualityPetCount;
            }
        }
    }
    public int guardLimit
    {
        get
        {
            if (SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.High)
            {
                return GeneralDefine.highQualityGuardCount;
            }
            else if (SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.Medium)
            {
                return GeneralDefine.medQualityGuardCount;
            }
            else
            {
                return GeneralDefine.lowQualityGuardCount;
            }
        }
    }
@@ -63,6 +101,11 @@
        }
    }
    public int GetIndex(uint sid)
    {
        return sortPlayerList.IndexOf(sid);
    }
    public bool CanPlay(uint sid)
    {
        GA_Hero _hero = PlayerDatas.Instance.hero;
@@ -71,7 +114,7 @@
            return false;
        }
        if(_hero.ServerInstID == sid)
        if (_hero.ServerInstID == sid)
        {
            return true;
        }
Fight/GameActor/GAMgr.cs
@@ -96,6 +96,40 @@
            SystemSetting.Instance.playerSyncCountChangeEvent += OnPlayerSyncCountChange;
            SystemSetting.Instance.OnSettingChanged += OnSettingChanged;
            SystemSetting.Instance.qualityLevelChangeEvent += OnQualityLevelChange;
        }
    }
    private void OnQualityLevelChange()
    {
        List<GActor> _petList = GetTypeList(E_ActorClassType.Pet);
        if (_petList == null || _petList.Count == 0)
        {
            return;
        }
        Debug.LogFormat("共有: {0} 只宠物", _petList.Count);
        foreach (var _pet in _petList)
        {
            var _parentID = _pet.ActorInfo.ownerSID;
            if (_parentID == PlayerDatas.Instance.PlayerId)
            {
                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);
            }
        }
    }
Fight/GameActor/GA_Pet.cs
@@ -45,6 +45,15 @@
                {
                    ShowOrHideModel(false);
                }
                else
                {
                    int _index = BattleEffectPlayRule.Instance.GetIndex(_parentSID);
                    if (_index == -1 || _index >= BattleEffectPlayRule.Instance.petLimit)
                    {
                        ShowOrHideModel(false);
                        Debug.LogFormat("宠物: {0} 的拥有者: {1} 在列表中且位于: {2}, 小于限制数量: {3}", ServerInstID, _parentSID, _index, BattleEffectPlayRule.Instance.petLimit);
                    }
                }
            }
        }
    }
Fight/GameActor/GActorNpcFight.cs
@@ -566,7 +566,7 @@
        m_Model.transform.localScale = Vector3.one;
        GA_Hero _hero = PlayerDatas.Instance.hero;
        if(_hero.SelectTarget == this)
        if (_hero.SelectTarget == this)
        {
            RequestName();
            RequestLifeBar();
@@ -617,17 +617,17 @@
        }
        else
        {
            if (MP_Name != m_Model.transform)
            if (MP_Name && MP_Name != m_Model.transform)
            {
                MP_Name.SetParent(Root);
            }
            if (MP_Hit != m_Model.transform)
            if (MP_Hit && MP_Hit != m_Model.transform)
            {
                MP_Hit.SetParent(Root);
            }
            if (MP_Stun != m_Model.transform)
            if (MP_Stun && MP_Stun != m_Model.transform)
            {
                MP_Stun.SetParent(Root);
            }
System/GeneralConfig/GeneralDefine.cs
@@ -146,9 +146,15 @@
    public static List<Item> ancientKingAwards = new List<Item>();
    public static int lowQualityCount { get; private set; }
    public static int medQualityCount { get; private set; }
    public static int highQualityCount { get; private set; }
    public static int lowQualityEffectCount { get; private set; }
    public static int medQualityEffectCount { get; private set; }
    public static int highQualityEffectCount { get; private set; }
    public static int lowQualityPetCount { get; private set; }
    public static int medQualityPetCount { get; private set; }
    public static int highQualityPetCount { get; private set; }
    public static int lowQualityGuardCount { get; private set; }
    public static int medQualityGuardCount { get; private set; }
    public static int highQualityGuardCount { get; private set; }
    public static int fairyLandBuffCondition { get; private set; }
    public static int fairyLandBuffId { get; private set; }
@@ -524,9 +530,19 @@
            }
            func = Config.Instance.Get<FuncConfigConfig>("QualityEffectConfig");
            lowQualityCount = int.Parse(func.Numerical1);
            medQualityCount = int.Parse(func.Numerical2);
            highQualityCount = int.Parse(func.Numerical3);
            lowQualityEffectCount = int.Parse(func.Numerical1);
            medQualityEffectCount = int.Parse(func.Numerical2);
            highQualityEffectCount = int.Parse(func.Numerical3);
            func = Config.Instance.Get<FuncConfigConfig>("QualityPetCountConfig");
            lowQualityPetCount = int.Parse(func.Numerical1);
            medQualityPetCount = int.Parse(func.Numerical2);
            highQualityPetCount = int.Parse(func.Numerical3);
            func = Config.Instance.Get<FuncConfigConfig>("QualityGuardCountConfig");
            lowQualityGuardCount = int.Parse(func.Numerical1);
            medQualityGuardCount = int.Parse(func.Numerical2);
            highQualityGuardCount = int.Parse(func.Numerical3);
            fairyLandBuffCondition = GetInt("XjmjAddHarm", 1);
            fairyLandBuffId = GetInt("XjmjAddHarm", 2);