0312 X秒未点击挑战BOSS引导提醒；loading图文字提醒；登录首次打开武将列表界面显示全体属性提醒；修复非上阵武将吞噬没红点问题

hch

4 天以前 2142bbf1f6962e3f0a104759b58ef6b4b995fd76

0312 X秒未点击挑战BOSS引导提醒；loading图文字提醒；登录首次打开武将列表界面显示全体属性提醒；修复非上阵武将吞噬没红点问题

 Main/System/Battle/BattleWin.cs

@@ -48,17 +48,19 @@

    protected override void OnPreOpen()
    {
        lastClickTime = Time.realtimeSinceStartup;
        // lastClickTime = Time.realtimeSinceStartup;
        needGuide = !MainLevelManager.Instance.IsPassedByMainLevelID(BattleManager.Instance.fightGuideMainLevelLimit);

        // SetBattleField(BattleManager.Instance.storyBattleField);
        BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;
        UIManager.Instance.OnOpenWindow += OnOpenWindow;
    }

    protected override void OnPreClose()
    {
        UIManager.Instance.CloseWindow<BattleHUDWin>();
        BattleManager.Instance.onBattleFieldCreate -= OnCreateBattleField;
        UIManager.Instance.OnOpenWindow -= OnOpenWindow;
    }

    private void OnCreateBattleField(string arg1, BattleField field)
@@ -123,7 +125,13 @@
        battleField.UpdateCanvas(canvas);
    }

    
    void OnOpenWindow(UIBase ui)
    {
        if (ui is MainBossEnterWin)
        {
            lastClickTime = Time.realtimeSinceStartup;
        }
    }

    // 新手期 玩家未做任何操作下，在主线战斗中提醒点击战锤
    void LateUpdate()
@@ -131,18 +139,18 @@
        if (!needGuide)
            return;

        if (Input.GetMouseButtonDown(0))
        {
            lastClickTime = Time.realtimeSinceStartup;
        }
        // if (Input.GetMouseButtonDown(0))
        // {
        //     lastClickTime = Time.realtimeSinceStartup;
        // }


        if (Time.realtimeSinceStartup - lastClickTime > BattleManager.Instance.fightGuideNoClickSeconds)
        {
            if (AutoFightModel.Instance.isAutoAttack)
            {
                return;
            }
            // if (AutoFightModel.Instance.isAutoAttack)
            // {
            //     return;
            // }

            if (NewBieCenter.Instance.inGuiding)
            {
@@ -154,6 +162,11 @@
                return;
            }

            if (!MainLevelManager.Instance.CanChallengeBoss())
            {
                return;
            }

            NewBieCenter.Instance.StartNewBieGuide(BattleManager.Instance.fightGuideID);
            needGuide = !MainLevelManager.Instance.IsPassedByMainLevelID(BattleManager.Instance.fightGuideMainLevelLimit);
            BattleManager.Instance.storyBattleField.IsPause = false;

 Main/System/GeneralConfig/GeneralDefine.cs

@@ -39,6 +39,7 @@

    public static Dictionary<int, string> itemIconDict { get; private set; }
    public static int mainRightFuncOpenFuncID { get; private set; }
    public static string[] loadingTips { get; private set; }

    public static void Init()
    {
@@ -86,6 +87,9 @@

            inGameDownLoadLevelCheckPoints = new List<int>(GetIntArray("InGameDownLoad"));
            inGameDownLoadHighLevel = GetInt("InGameDownLoad", 2);

            config = FuncConfigConfig.Get("LoadingTip");
            loadingTips = JsonMapper.ToObject<string[]>(config.Numerical1);
        }
        catch (Exception ex)
        {

 Main/System/HeroUI/HeroListWin.cs

@@ -62,6 +62,7 @@
        // CreateScroller();
        Refresh();
        fiterManager.Display(0, SelectJobCountry);

    }

    protected override void OnPreClose()
@@ -101,6 +102,17 @@
        }
    }


    protected override void NextFrameAfterOpen()
    {
        if (!NewBieCenter.Instance.inGuiding && !HeroUIManager.Instance.isOpenHeroTip && TimeUtility.OpenDay < 3)
        {
            attrOnTip.SetActive(true);
            HeroUIManager.Instance.isOpenHeroTip = true;
        }
    }
    

    int FindJumpIndexByHeroID(int heroID)
    {
        int index = -1;

 Main/System/HeroUI/HeroTrainWin.cs

@@ -238,7 +238,7 @@
        jobPosNameText.text = HeroUIManager.Instance.GetJobName(hero.heroConfig.Class);
        descText.text = hero.heroConfig.Desc;
        fightPowerText.text = UIHelper.ReplaceLargeArtNum(hero.CalculateFightPower());
        PlayerMainDate.Instance.AddPowerNotOnTeam(hero);
        // PlayerMainDate.Instance.AddPowerNotOnTeam(hero);
        lockImg.SetActive(hero.isLock);
        unLockImg.SetActive(!hero.isLock);

@@ -805,29 +805,10 @@
        redpointAwake.SetActive(false);
        redpointGift.SetActive(false);
        redpointLVUP.SetActive(false);
        if (!hero.IsInTeamByTeamType(TeamType.Story))
        {
            return;
        }


        var heroCnt = PackManager.Instance.GetItemCountByID(PackType.Hero, hero.heroId);
        var itemPack = PackManager.Instance.GetSinglePack(PackType.Item);

        //5星后才能觉醒
        if (hero.heroStar >= HeroUIManager.Instance.starLevelCanAwake)
        {
            //判断觉醒材料是否足够
            var maxAwakeLV = HeroAwakeConfig.GetMaxAwakeLV(hero.heroId);
            if (hero.awakeLevel < maxAwakeLV)
            {
                var config = HeroQualityAwakeConfig.GetQualityAwakeConfig(hero.Quality, hero.awakeLevel);
                if (itemPack.GetCountById(config.UPCostItem[0]) >= config.UPCostItem[1])
                {
                    redpointAwake.SetActive(true);
                }
            }
        }

        if (heroCnt > 1)
        {
@@ -857,5 +838,29 @@
                redpointLVUP.SetActive(true);
            }
        }


        if (!hero.IsInTeamByTeamType(TeamType.Story))
        {
            return;
        }


        //5星后才能觉醒
        if (hero.heroStar >= HeroUIManager.Instance.starLevelCanAwake)
        {
            //判断觉醒材料是否足够
            var maxAwakeLV = HeroAwakeConfig.GetMaxAwakeLV(hero.heroId);
            if (hero.awakeLevel < maxAwakeLV)
            {
                var config = HeroQualityAwakeConfig.GetQualityAwakeConfig(hero.Quality, hero.awakeLevel);
                if (itemPack.GetCountById(config.UPCostItem[0]) >= config.UPCostItem[1])
                {
                    redpointAwake.SetActive(true);
                }
            }
        }

     
    }
}

 Main/System/HeroUI/HeroUIManager.cs

@@ -32,6 +32,8 @@

    public List<int> heroSpecialAttrsForSelect = new List<int>();  //筛选用的特殊属性汇总

    public bool isOpenHeroTip = false;

    public override void Init()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitialize;
@@ -94,6 +96,7 @@
        heroCollectInfoDic.Clear();
        newHeroIDList.Clear();
        firstHeroIDBookUpdate = 0;
        isOpenHeroTip = false;
    }



 Main/System/Launch/LoadingWin.cs

@@ -19,7 +19,7 @@

    protected List<Sprite> backGrounds = new List<Sprite>();

    protected float backGroundTimer = 0f;
    protected float backGroundTimer = 10f;
    protected int backGroundIndex = 0;

    protected override void InitComponent()
@@ -116,31 +116,36 @@
    protected void LateUpdate()
    {
        UpdateProgress();
        // CopiedLogic_LateUpdate();
        CopiedLogic_LateUpdate();
    }

    private void CopiedLogic_LateUpdate()
    {
        // backGroundTimer += Time.deltaTime;
        // if (backGroundTimer >= 3f)
        // {
        //     backGroundTimer -= 3f;
        //     if (backGrounds.Count > 1)
        //     {
        //         m_BackGround.overrideSprite = backGrounds[(++backGroundIndex) % backGrounds.Count];
        //     }
        backGroundTimer += Time.deltaTime;
        if (backGroundTimer >= 3f)
        {
            backGroundTimer = 0f;
            // if (backGrounds.Count > 1)
            // {
            //     m_BackGround.overrideSprite = backGrounds[(++backGroundIndex) % backGrounds.Count];
            // }

        //     //  考虑在这里做这个描述的切换 或者根据图片来做提示词
        //     // m_StageDescription.text = "";
        // }
            //  考虑在这里做这个描述的切换 或者根据图片来做提示词
            // m_StageDescription.text = "";

            var maxNum = GeneralDefine.loadingTips.Length;
            //随机一个提示词
            var randomIndex = UnityEngine.Random.Range(0, maxNum);
            m_StageDescription.text = Language.Get(GeneralDefine.loadingTips[randomIndex]);
        }
    }

    public void SetData(LaunchWinData _launchWinData)
    {
        backGroundTimer = _launchWinData.backGroundTimer;
        backGroundIndex = _launchWinData.backGroundIndex;
        // m_BackGround.overrideSprite = _launchWinData.sprite;
        backGrounds = _launchWinData.sprites;
        m_StageDescription.text = Language.GetFromLocal(44);//最后Completed一定是这个 考虑要不要塞入LaunchWinData..
        // backGroundTimer = _launchWinData.backGroundTimer;
        // backGroundIndex = _launchWinData.backGroundIndex;
        // // m_BackGround.overrideSprite = _launchWinData.sprite;
        // backGrounds = _launchWinData.sprites;
        // m_StageDescription.text = Language.GetFromLocal(44);//最后Completed一定是这个 考虑要不要塞入LaunchWinData..
    }
}

 Main/System/Main/HeroFightingCardCell.cs

@@ -138,7 +138,7 @@
            }
            return;
        }
        UIManager.Instance.OpenWindow<HeroCallWin>();
        UIManager.Instance.OpenWindow<HeroPosWin>();
    }
    void OnSkillCast(bool isfighting)
    {