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

client_Wu Xijin

2019-07-04 9e51fdae7927ec02f85ecfe3fc3b14f5e08d872f

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

 Core/GameEngine/Model/Config/TaskFeedbackConfig.cs

@@ -24,7 +24,7 @@
    public readonly int jump;

    public readonly string[] funcTitles;

    public readonly string failFuncs;

    public readonly int onlyOneFunc;

    public readonly int[] onlyOneFunc;

    public readonly string[] remind;

    public TaskFeedbackConfig()
@@ -59,7 +59,12 @@


            failFuncs = tables[10];



            int.TryParse(tables[11],out onlyOneFunc); 
            string[] onlyOneFuncStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            onlyOneFunc = new int[onlyOneFuncStringArray.Length];
            for (int i=0;i<onlyOneFuncStringArray.Length;i++)
            {
                 int.TryParse(onlyOneFuncStringArray[i],out onlyOneFunc[i]);
            }



            remind = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
        }

 Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b80a883f246077d46ab59d6938182ec9
timeCreated: 1562229408
timeCreated: 1562231068
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Fight/Actor/AI/HeroAI_Base.cs

@@ -51,7 +51,12 @@
            _skill = CanCast(skillList);

        }



        if (_skill == null && _hero.CanCommonAtk())

        if (_skill != null)

        {

            return _skill;

        }



        if (_hero.CanCommonAtk())

        {

            int _index = _hero.nextComAtkIndex;

            if (_index == -1)

@@ -60,27 +65,10 @@
            }

            int _comSkillID = _hero.GetCommonSkillID(_index);



            _skill = _hero.SkillMgr.Get(_comSkillID);



            if (_skill != null && _skill.skillInfo != null && _skill.skillInfo.config != null)

            {

                bool _forceCast = false;



                SkillHelper.EffectValue _effectValue;

                if (SkillHelper.Instance.TryGetExpertSkillEvByMainSkillID(_skill.id, 4093, out _effectValue))

                {

                    _forceCast = true;

                }



                // 判断是否是被封禁的技能

                if (!StatusMgr.Instance.CanAttack(_hero.ServerInstID, _skill.skillInfo.config) && !_forceCast)

                {

                    return _skill;

                }

            }

            return _hero.SkillMgr.Get(_comSkillID);

        }



        return _skill;

        return null;

    }



    protected Skill CanCast(int[] skillList)

@@ -144,6 +132,22 @@
            return false;

        }



        bool _canCast = true;



        bool _forceCast = false;



        SkillHelper.EffectValue _effectValue;

        if (SkillHelper.Instance.TryGetExpertSkillEvByMainSkillID(skillID, 4093, out _effectValue))

        {

            _forceCast = true;

        }

        var _skillConfig = SkillConfig.Get(skillID);

        // 判断是否是被封禁的技能

        if (!StatusMgr.Instance.CanAttack(PlayerDatas.Instance.PlayerId, _skillConfig) && !_forceCast)

        {

            _canCast = false;

        }



        if (skillID == xpSkillID)

        {

            GA_Hero _hero = PlayerDatas.Instance.hero;

@@ -152,11 +156,11 @@
             || GeneralDefine.NoXpDungeons.Contains(PlayerDatas.Instance.baseData.MapID)

             || (_hero.SelectTarget != null && _hero.SelectTarget is GActorPlayerBase)) && !userClick)

            {

                return false;

                _canCast = false;

            }

        }



        return true;

        return _canCast;

    }



    protected GActorFight DecideAttackTarget(Vector3 searchCenter, float range, int lockNpcID = -1)


 Fight/GameActor/GActorPlayerBase.cs

@@ -2995,6 +2995,10 @@


    public void ReqLingGenEffect(int id)

    {

        if (!ReikiRootEffectConfig.Has(id))

        {

            return;

        }

        RlsLingGenEffect();

        if (!LingGenNode)

        {


 System/Equip/RealmEquipWin.cs

@@ -207,6 +207,7 @@
                weaponId = appearance.weapon,
                secondaryId = appearance.secondary,
                keepRotation = !resetRotation,
                reikiRootEffectId = PlayerDatas.Instance.baseData.reikiRootEffectId,
            });
        }


 System/FashionDress/FashionDressWin.cs

@@ -369,6 +369,7 @@
                fashionClothesId = fashionDressClothesId,

                fashionWeaponId = fashionDressWeaponId,

                fashionSecondaryId = fashionDressSecondaryId,

                reikiRootEffectId = PlayerDatas.Instance.baseData.reikiRootEffectId,

                isDialogue = false,

            };

            UI3DModelExhibition.Instance.ShowPlayer(m_RawModel, data);


 System/MainInterfacePanel/TaskFeedbackModel.cs

@@ -86,6 +86,7 @@
                            }

                        }

                        break;

                    case TaskFeedbackType.SkyTowerFightPoint:

                    case TaskFeedbackType.ReikiPoint:

                        {

                            if (!string.IsNullOrEmpty(config.reikiRoot))

@@ -180,7 +181,8 @@
                                    if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))

                                    {

                                        taskFeedbackFuncs.Clear();

                                        if (config.onlyOneFunc == 1)

                                        if (config.onlyOneFunc != null &&

                                            index < config.onlyOneFunc.Length && config.onlyOneFunc[index] == 1)

                                        {

                                            taskFeedbackFuncs.Add(succFuncs[0]);

                                        }

@@ -219,7 +221,8 @@
                                    if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))

                                    {

                                        taskFeedbackFuncs.Clear();

                                        if (config.onlyOneFunc == 1)

                                        if (config.onlyOneFunc != null &&

                                            index < config.onlyOneFunc.Length && config.onlyOneFunc[index] == 1)

                                        {

                                            taskFeedbackFuncs.Add(succFuncs[0]);

                                        }

@@ -259,7 +262,8 @@
                                    if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))

                                    {

                                        taskFeedbackFuncs.Clear();

                                        if (config.onlyOneFunc == 1)

                                        if (config.onlyOneFunc != null &&

                                            index < config.onlyOneFunc.Length && config.onlyOneFunc[index] == 1)

                                        {

                                            taskFeedbackFuncs.Add(succFuncs[0]);

                                        }

@@ -436,7 +440,28 @@
                        var skyTowerConfig = SkyTowerConfig.Get(config.condition);

                        if (skyTowerConfig != null)

                        {

                            return PlayerDatas.Instance.baseData.FightPoint >= skyTowerConfig.fightPower;

                            if (feedback.reikiRoots != null && PlayerDatas.Instance.baseData.FightPoint < skyTowerConfig.fightPower)

                            {

                                var job = PlayerDatas.Instance.baseData.Job;

                                var reikiRoots = feedback.reikiRoots[job];

                                foreach (var reikiRoot in reikiRoots)

                                {

                                    if (reikiRootModel.GetReikiRootPoint(reikiRoot[0]) < reikiRoot[1])

                                    {

                                        condition = 1;

                                    }

                                    else

                                    {

                                        condition = 0;

                                    }

                                    break;

                                }

                                return false;

                            }

                            else

                            {

                                return PlayerDatas.Instance.baseData.FightPoint >= skyTowerConfig.fightPower;

                            }

                        }

                    }

                    break;


 System/RoleParticulars/OtherPlayerEquipModel.cs

@@ -34,6 +34,7 @@
        public int playerRealm { get; private set; }
        public int playerVipLevel { get; private set; }
        public int wing { get; private set; }
        public int reikiRootEffectId { get; private set; }

        public event Action selectedLevelChangeEvent;
        Dictionary<int, EquipDetailsGroup> equipDetailsGroups = new Dictionary<int, EquipDetailsGroup>();
@@ -55,6 +56,7 @@
            this.playerRealm = info.realm;
            this.playerVipLevel = info.vipLevel;
            this.wing = info.wing;
            this.reikiRootEffectId = info.reikiRootEffectId;

            SelectLevel(1);
        }
@@ -445,6 +447,7 @@
            public int realm;
            public int vipLevel;
            public int wing;
            public int reikiRootEffectId;
        }

        public struct SuitInfo

 System/RoleParticulars/OtherPlayerEquipWin.cs

@@ -132,6 +132,7 @@
                weaponId = appearance.weapon,
                secondaryId = appearance.secondary,
                keepRotation = resetRoleRotation,
                reikiRootEffectId = model.reikiRootEffectId,
            });

            resetRoleRotation = false;

 System/RoleParticulars/RoleParticularsWin.cs

@@ -131,6 +131,7 @@
                job = viewPlayerData.rolePropData.Job,

                vipLevel = viewPlayerData.rolePropData.VIPLV,

                wing = wing,

                reikiRootEffectId = (int)viewPlayerData.rolePropData.EquipShowSwitch / 1000 % 1000,

            });

        }