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

yyl

1 天以前 725b7b2374f43582a2d78b2cae3f8303359651b8

 Main/System/DayMission/WeekBattlePassWin.cs

@@ -20,12 +20,12 @@
    {

        buyBtn.AddListener(() =>

        {

            RechargeManager.Instance.CTG(BattlePassManager.Instance.GetCTGIDByType(BattlePassManager.WeekBattlePassType));

            RechargeManager.Instance.CTG(BattlePassManager.Instance.GetCTGIDByType((int)BattlePassType.Week));

        });

    }

    protected override void OnPreOpen()

    {

        battlePassData = BattlePassManager.Instance.GetBattlePassData(BattlePassManager.WeekBattlePassType);

        battlePassData = BattlePassManager.Instance.GetBattlePassData((int)BattlePassType.Week);

        if (battlePassData == null) return;

        scroller.OnRefreshCell += OnRefreshCell;

        GlobalTimeEvent.Instance.secondEvent += OnSecondEvent;

@@ -60,7 +60,7 @@


    void BattlePassDataUpdateEvent(int type)

    {

        if (type == BattlePassManager.WeekBattlePassType)

        if (type == (int)BattlePassType.Week)

        {

            Display();

        }

@@ -75,7 +75,7 @@


        if (battlePassData.isActivite == 0)

        {

            var ctgID = BattlePassManager.Instance.GetCTGIDByType(BattlePassManager.WeekBattlePassType);

            var ctgID = BattlePassManager.Instance.GetCTGIDByType((int)BattlePassType.Week);

            RechargeManager.Instance.TryGetOrderInfo(ctgID, out var orderInfoConfig);

            buyText.text = Language.Get("PayMoneyNum", orderInfoConfig.PayRMBNumOnSale);

            buyBtn.SetInteractable(true);

@@ -91,7 +91,7 @@
    void CreateScroller()

    {

        scroller.Refresh();

        var values = ZhanlingConfig.GetTypeToIDDict(BattlePassManager.WeekBattlePassType).Values.ToList();

        var values = ZhanlingConfig.GetTypeToIDDict((int)BattlePassType.Week).Values.ToList();

        values.Sort();

        for (int i = 0; i < values.Count; i++)

        {

@@ -99,7 +99,7 @@
        }

        scroller.Restart();



        scroller.JumpIndex(BattlePassManager.Instance.JumpIndex(battlePassData, BattlePassManager.WeekBattlePassType, (int)battlePassData.value1));

        scroller.JumpIndex(BattlePassManager.Instance.JumpIndex(battlePassData, (int)BattlePassType.Week, (int)battlePassData.value1));

    }