0312 无蒙版点击不需要判断镂空；防范断线重连报错

hch

3 天以前 5d75734ef21459105f89bc8a0d4d235c8c137e62

0312 无蒙版点击不需要判断镂空；防范断线重连报错

 Main/System/Equip/EquipModel.cs

@@ -31,6 +31,7 @@
    {
        DTCA814_tagMCMakeItemAnswer.MakeItemAnswerEvent += OnEquipResult;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += BeforePlayerDataInitialize;
        EventBroadcast.Instance.RemoveListener<string, BattleDrops, Action>(EventName.BATTLE_DROP_ITEMS, OnDropEvent);
        EventBroadcast.Instance.AddListener<string, BattleDrops, Action>(EventName.BATTLE_DROP_ITEMS, OnDropEvent);
        ParseConfig();
    }

 Main/System/Equip/ItemsOnFloor.cs

@@ -40,6 +40,9 @@
    //主界面切换模式触发

    private void OnEnable()

    {

        //bug记录：再防范一次，理论上不可能两次触发OnEnable期间 没有触发OnDisable

        EquipModel.Instance.OnItemDropEvent -= NotifyPlayItemDrop;

        PackManager.Instance.DeleteItemEvent -= DeleteDropItem;

        //主界面打开和显隐都要刷新

        Display(true, EquipModel.Instance.lastDropIndexs);

        EquipModel.Instance.OnItemDropEvent += NotifyPlayItemDrop;


 Main/System/Main/AutoFightModel.cs

@@ -95,7 +95,7 @@
        ParseConfig();
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += BeforePlayerInit;
        BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;

        EventBroadcast.Instance.RemoveListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnSkillCast);
        EventBroadcast.Instance.AddListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnSkillCast);

    }
@@ -104,7 +104,7 @@
    {
        BattleManager.Instance.onBattleFieldCreate -= OnCreateBattleField;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= BeforePlayerInit;
        
        EventBroadcast.Instance.RemoveListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnSkillCast);

    }


 Main/System/Main/MainWin.cs

@@ -327,8 +327,12 @@
            cdTween.SetStartState();
            cdTween.Play(() =>
            {
                AutoFightModel.Instance.fightingHeroSkinID = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid).SkinID;
                var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
                if (tmpHero != null)
                {
                    AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
                fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
                }
            });
            fightHeroScale.SetStartState();
            fightHeroScale.Play();
@@ -343,11 +347,14 @@

        if (AutoFightModel.Instance.fightingHeroSkinID == 0)
        {
            AutoFightModel.Instance.fightingHeroSkinID = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid).SkinID;
        }

            var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
            if (tmpHero != null)
            {
                AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
        fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
    }
        }
    }

    void OnSkillCast(bool isfighting)
    {

 Main/System/NewBieGuidance/NewBieWin.cs

@@ -294,6 +294,10 @@
            {

                return;

            }

            if (stepConfig.clickCompleteNoMask)

            {

                return;

            }

            if (stepConfig.clickAnyWhereComplete || m_NewBieMask.mask.IsInCirleArea(Input.mousePosition, CameraManager.uiCamera))

            {

                if (m_ClickTarget == null)