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

client_Wu Xijin

2019-04-08 b42b7e1d1651f5ab4a8c7f3679129628ba84ddb6

 System/Dungeon/TargetBriefInfoWin.cs

@@ -68,7 +68,8 @@
        if (dataMapId == DemonJarModel.DEMONJAR_MAPID

            || dataMapId == JadeDynastyBossModel.JADEDYNASTY_MAP

            || dataMapId == JadeDynastyTowerModel.DATA_MAPID

            || dataMapId == AllianceBossModel.DATAMAPID)

            || dataMapId == AllianceBossModel.DATAMAPID

            || dataMapId == RidingPetBossModel.RIDINGPETBOSS_MAP)

        {

            if (_show)

            {

@@ -112,7 +113,8 @@
        if (dataMapId == DemonJarModel.DEMONJAR_MAPID

            || dataMapId == JadeDynastyBossModel.JADEDYNASTY_MAP

            || dataMapId == JadeDynastyTowerModel.DATA_MAPID

            || dataMapId == AllianceBossModel.DATAMAPID)

            || dataMapId == AllianceBossModel.DATAMAPID

            || dataMapId == RidingPetBossModel.RIDINGPETBOSS_MAP)

        {

            if (!WindowCenter.Instance.IsOpen("DemonJarBossLifeBarWin"))

            {

@@ -331,7 +333,8 @@
                    if (dataMapId != DemonJarModel.DEMONJAR_MAPID

                        && dataMapId != JadeDynastyBossModel.JADEDYNASTY_MAP

                        && dataMapId != JadeDynastyTowerModel.DATA_MAPID

                        && dataMapId != AllianceBossModel.DATAMAPID)

                        && dataMapId != AllianceBossModel.DATAMAPID

                        && dataMapId != RidingPetBossModel.RIDINGPETBOSS_MAP)

                    {

                        ShowBossLifeBar(bossInfo, true);

                    }

@@ -359,7 +362,8 @@
                    if (dataMapId != DemonJarModel.DEMONJAR_MAPID

                        && dataMapId != JadeDynastyBossModel.JADEDYNASTY_MAP

                        && dataMapId != JadeDynastyTowerModel.DATA_MAPID

                        && dataMapId != AllianceBossModel.DATAMAPID)

                        && dataMapId != AllianceBossModel.DATAMAPID

                        && dataMapId != RidingPetBossModel.RIDINGPETBOSS_MAP)

                    {

                        if (bossInfo.npcId != TargetBriefInfo.bossInfo.npcId)

                        {