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

client_linchunjie

2019-04-22 33a2c609eb2fba9382da67a263b9fb45dc814e93

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

 Fight/GameActor/GA_NpcClientCollect.cs

@@ -202,7 +202,7 @@
        WindowCenter.Instance.Close<NormalCollectWin>();
        m_StartCollect = false;
        var _hero = PlayerDatas.Instance.hero;
        if (_hero != null && _hero.ActorInfo.serverDie)
        if (_hero != null && !_hero.ActorInfo.serverDie)
        {
            if (_hero.IsCollect())
            {

 Fight/GameActor/GActor.cs

@@ -238,6 +238,7 @@


        OnUnit();



        belongEventID = -1;

        State = E_ActorState.Idle;

        DestPos = Vector3.zero;

        ActorInfo.serverDie = true;


 System/Dungeon/TargetBriefInfoWin.cs

@@ -64,12 +64,7 @@
        }



        var mapId = PlayerDatas.Instance.baseData.MapID;

        var dataMapId = MapUtility.GetDataMapId(mapId);

        if (dataMapId == DemonJarModel.DEMONJAR_MAPID

            || dataMapId == JadeDynastyBossModel.JADEDYNASTY_MAP

            || dataMapId == JadeDynastyTowerModel.DATA_MAPID

            || dataMapId == AllianceBossModel.DATAMAPID

            || dataMapId == RidingPetBossModel.RIDINGPETBOSS_MAP)

        if (mapId == DemonJarModel.DEMONJAR_SINGLEMAPID)

        {

            if (_show)

            {

@@ -109,12 +104,7 @@
        }



        var mapId = PlayerDatas.Instance.baseData.MapID;

        var dataMapId = MapUtility.GetDataMapId(mapId);

        if (dataMapId == DemonJarModel.DEMONJAR_MAPID

            || dataMapId == JadeDynastyBossModel.JADEDYNASTY_MAP

            || dataMapId == JadeDynastyTowerModel.DATA_MAPID

            || dataMapId == AllianceBossModel.DATAMAPID

            || dataMapId == RidingPetBossModel.RIDINGPETBOSS_MAP)

        if (mapId == DemonJarModel.DEMONJAR_SINGLEMAPID)

        {

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

            {

@@ -329,12 +319,7 @@


                if (bossInfo.instanceId != 0)

                {

                    var dataMapId = MapUtility.GetDataMapId();

                    if (dataMapId != DemonJarModel.DEMONJAR_MAPID

                        && dataMapId != JadeDynastyBossModel.JADEDYNASTY_MAP

                        && dataMapId != JadeDynastyTowerModel.DATA_MAPID

                        && dataMapId != AllianceBossModel.DATAMAPID

                        && dataMapId != RidingPetBossModel.RIDINGPETBOSS_MAP)

                    if (PlayerDatas.Instance.baseData.MapID == DemonJarModel.DEMONJAR_SINGLEMAPID)

                    {

                        ShowBossLifeBar(bossInfo, true);

                    }

@@ -358,12 +343,7 @@
                }

                else

                {

                    var dataMapId = MapUtility.GetDataMapId();

                    if (dataMapId != DemonJarModel.DEMONJAR_MAPID

                        && dataMapId != JadeDynastyBossModel.JADEDYNASTY_MAP

                        && dataMapId != JadeDynastyTowerModel.DATA_MAPID

                        && dataMapId != AllianceBossModel.DATAMAPID

                        && dataMapId != RidingPetBossModel.RIDINGPETBOSS_MAP)

                    if (PlayerDatas.Instance.baseData.MapID == DemonJarModel.DEMONJAR_SINGLEMAPID)

                    {

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

                        {


 System/FindPrecious/DemonJarBossLifeBarWin.cs

@@ -21,7 +21,6 @@
        TargetBriefInfo.MonsterInfo bossInfo;



        DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }



        bool inited = false;