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

yyl

5 天以前 1d452e735a0dac22dab7d0bf7c3bc7458de30448

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

 Main/System/Achievement/AchievementManager.cs

@@ -199,6 +199,10 @@
            }
            //根据ID判断是否有可领取的
            var allAchivement = SuccessConfig.GetTypeToIDDict(type);
            if (allAchivement.IsNullOrEmpty())
            {
                continue;
            }
            var process = GetAchievementProgress(type);
            foreach (var id in allAchivement)
            {

 Main/System/Battle/BattleWin.cs

@@ -108,7 +108,7 @@

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

 Main/System/HeroUI/HeroTrainWin.cs

@@ -873,7 +873,7 @@


        //5星后才能觉醒
        if (hero.heroStar >= HeroUIManager.Instance.starLevelCanAwake)
        if (hero.heroStar >= HeroUIManager.Instance.starLevelCanAwake && FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.HeroAwake))
        {
            //判断觉醒材料是否足够
            var maxAwakeLV = HeroAwakeConfig.GetMaxAwakeLV(hero.heroId);

 Main/System/HeroUI/HeroUIManager.cs

@@ -507,14 +507,17 @@
        }
        else
        {
            //判断觉醒材料是否足够
            var maxAwakeLV = HeroAwakeConfig.GetMaxAwakeLV(hero.heroId);
            if (hero.awakeLevel < maxAwakeLV)
            if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.HeroAwake))
            {
                var config = HeroQualityAwakeConfig.GetQualityAwakeConfig(hero.Quality, hero.awakeLevel);
                if (itemPack.GetCountById(config.UPCostItem[0]) >= config.UPCostItem[1])
                //判断觉醒材料是否足够
                var maxAwakeLV = HeroAwakeConfig.GetMaxAwakeLV(hero.heroId);
                if (hero.awakeLevel < maxAwakeLV)
                {
                    return 1;
                    var config = HeroQualityAwakeConfig.GetQualityAwakeConfig(hero.Quality, hero.awakeLevel);
                    if (itemPack.GetCountById(config.UPCostItem[0]) >= config.UPCostItem[1])
                    {
                        return 1;
                    }
                }
            }
        }

 Main/System/Login/LoginWin.cs

@@ -68,9 +68,14 @@
            GameAgeWarnWin.data = 2;
            UIManager.Instance.OpenWindow<GameAgeWarnWin>();
        });
        ageWarn.SetListener(() => {
        ageWarn.SetListener(() =>
        {
            GameAgeWarnWin.data = 3;
            UIManager.Instance.OpenWindow<GameAgeWarnWin>();
        });
        checkRead.onValueChanged.AddListener((bool value) =>
        {
            LocalSave.SetBool("secretToggleStart5", value);
        });
    }

@@ -239,11 +244,9 @@
        if (!checkRead.isOn)
        {
            ConfirmCancel.ShowPopConfirm(Language.Get("agreementTitle"), Language.Get("agreementInfo"));
            LocalSave.SetBool("secretToggleStart5", false); //方便测试
            return;
        }

        LocalSave.SetBool("secretToggleStart5", true);

        SDKUtils.Instance.SendHideFloatWin();


 Main/System/NewBieGuidance/NewBieCenter.cs

@@ -384,7 +384,10 @@
            guideCompletedEvent(guideRecord);

        }



        BattleManager.Instance.storyBattleField.IsPause = false;

        if (BattleManager.Instance.storyBattleField != null)

        {

            BattleManager.Instance.storyBattleField.IsPause = false;

        }

    }



    public void RemoveNewBieGuide(int _id)


 Main/System/OfficialRank/OfficialTitleCell.cs

@@ -107,7 +107,7 @@
    public void InitUI(int offcialRank, int titleID)
    {
        LoadPrefab();   //存在被卸载的可能，重新加载
        if (titleID == 0)
        if (!TitleConfig.HasKey(titleID))
        {
            officialRankObj.SetActive(true);
            var config = RealmConfig.Get(offcialRank);

 Main/Utility/EnumHelper.cs

@@ -836,6 +836,7 @@
    Recharge = 22,//充值
    PrivilegeCard = 25, //特权卡
    Horse = 37,  //坐骑
    HeroAwake = 38, //武将觉醒
    BattlePass = 40, //基金（战令）
    LLMJ = 41,  //历练秘笈
    OSMainLevl = 45, //开服关卡榜活动