Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

8 天以前 aee07e17664b4e598f4bc54460cffce26b8b823f

 Main/System/Battle/BattleWin.cs

@@ -48,7 +48,9 @@

    protected override void OnPreOpen()
    {
        // lastClickTime = Time.realtimeSinceStartup;
        lastClickTime = Time.realtimeSinceStartup;
        UIManager.Instance.OnCloseWindow += OnCloseWindow;
        PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataRefresh;
        needGuide = !MainLevelManager.Instance.IsPassedByMainLevelID(BattleManager.Instance.fightGuideMainLevelLimit);

        // SetBattleField(BattleManager.Instance.storyBattleField);
@@ -58,6 +60,8 @@

    protected override void OnPreClose()
    {
        UIManager.Instance.OnCloseWindow -= OnCloseWindow;
        PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerDataRefresh;
        UIManager.Instance.CloseWindow<BattleHUDWin>();
        BattleManager.Instance.onBattleFieldCreate -= OnCreateBattleField;
        UIManager.Instance.OnOpenWindow -= OnOpenWindow;
@@ -71,10 +75,6 @@
        }
    }

    protected override void OnOpen()
    {
        base.OnOpen();
    }

    protected override void OnClose()
    {
@@ -89,16 +89,38 @@
        battleField = null;
    }

    protected override void NextFrameAfterOpen()


    void OnCloseWindow(UIBase ui)
    {
        base.NextFrameAfterOpen();
        if (ui is NewBieWin)
        {
            lastClickTime = Time.realtimeSinceStartup;
        }
    }

    protected override void CompleteClose()
    bool lastIsBoss = false;

    void OnPlayerDataRefresh(PlayerDataType type)
    {
        base.CompleteClose();
        switch (type)
        {

            case PlayerDataType.ExAttr1:
            case PlayerDataType.ExAttr2:
                if (!lastIsBoss && MainLevelManager.Instance.CanChallengeBoss())
                {
                    //可挑战的时候也要等CD
                    lastClickTime = Time.realtimeSinceStartup;
                    lastIsBoss = true;
                }
                break;

        }
    }



    public void SetBattleField(BattleField _battleField)
    {
        battleField = _battleField;