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

client_Wu Xijin

2019-05-21 6e96c64775c4a6128e09fbad2b8a9da3db767618

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

 System/HazyRegion/HazyRegionModel.cs

@@ -514,7 +514,9 @@


        void SendGotoIncidentDungeon(HazyRegionConfig config)

        {

            if (config.dungeonType == 2)

            if (config.dungeonId == HazyGrassModel.FairyGrassMapId ||

                config.dungeonId == HazyGrassModel.ReikiGrassMapId ||

                config.dungeonId == HazyDemonKingModel.DEMONKINGMAPID2)

            {

                var pak = new CC105_tagCMEnterCrossServer();

                pak.DataMapID = (uint)config.dungeonId;


 System/Skill/ExpertSkillSelectWin.cs

@@ -359,8 +359,8 @@


            var level = 0;

            var selectExpertSkill = 0;

            if (model.TryGetExpertSkill(selectSkillId, out selectExpertSkill)

                && selectExpertSkill != selectExpert && model.TryGetExpertActiveLevel(selectExpert, out level)

            model.TryGetExpertSkill(selectSkillId, out selectExpertSkill);

            if (selectExpertSkill != selectExpert && model.TryGetExpertActiveLevel(selectExpert, out level)

                && level > 0)

            {

                var pak = new CA516_tagCMSelectSkillElement();