662 武将试炼 异步改同步

lcy

2026-06-23 9876739284ab81833d2768a904e1564281addae5

662 武将试炼 异步改同步

# Conflicts:
#	Main/Config/ConfigManager.cs
#	Main/Manager/UIManager.UIAtlasPreloadMap.Generated.cs
#	Main/System/WarlordPavilion/TowerBaseWin.cs

 Main/System/Battle/BattleField/HeroTrialBattleField.cs

@@ -11,10 +11,10 @@
    {
    }

    public override async UniTask Init(int MapID, int FuncLineID, JsonData _extendData,
    public override void Init(int MapID, int FuncLineID, JsonData _extendData,
        List<TeamBase> _redTeamList, List<TeamBase> _blueTeamList, byte turnMax)
    {
        await base.Init(MapID, FuncLineID, _extendData, _redTeamList, _blueTeamList, turnMax);
        base.Init(MapID, FuncLineID, _extendData, _redTeamList, _blueTeamList, turnMax);

        extendData = _extendData;
        HeroTrialManager.Instance.TryGetConfigByFuncLineID(FuncLineID, out trialConfig);
@@ -65,7 +65,7 @@
        if (UIManager.Instance.IsOpened<HeroTrialBattleWin>())
        {
            UIManager.Instance.CloseWindow<HeroTrialBattleWin>();
            UIManager.Instance.OpenWindowAsync<TowerBaseWin>(1).Forget();
            UIManager.Instance.OpenWindow<TowerBaseWin>(1);
        }
    }

@@ -91,7 +91,7 @@
        HeroTrialBattleWin battleWin = UIManager.Instance.GetUI<HeroTrialBattleWin>();
        if (battleWin == null)
        {
            battleWin = await UIManager.Instance.OpenWindowAsync<HeroTrialBattleWin>();
            battleWin = UIManager.Instance.OpenWindow<HeroTrialBattleWin>();
        }
        battleWin.SetBattleField(this);


 Main/System/ChallengeTab/HeroTrialTabHandler.cs

@@ -31,7 +31,7 @@
            HeroTrialBattleWin battleWin;
            if (!UIManager.Instance.IsOpened<HeroTrialBattleWin>())
            {
                battleWin = await UIManager.Instance.OpenWindowAsync<HeroTrialBattleWin>();
                battleWin = UIManager.Instance.OpenWindow<HeroTrialBattleWin>();
            }
            else
            {
@@ -41,7 +41,7 @@
        }
        else
        {
            UIManager.Instance.OpenWindowAsync<TowerBaseWin>(1).Forget();
            UIManager.Instance.OpenWindow<TowerBaseWin>(1);
        }
    }


 Main/System/HeroTrial/HeroTrialBattleWin.cs

@@ -48,7 +48,7 @@
        }
        else
        {
            UIManager.Instance.OpenWindowAsync<MainWin>().Forget();
            UIManager.Instance.OpenWindow<MainWin>();
        }

        if (bossBattleObject != null)
@@ -242,8 +242,8 @@
                    SmallTipWin.showText = Language.Get("SmallTipFomat", SkillConfig.Get(skillID)?.SkillName, SkillConfig.Get(skillID)?.Description);
                    SmallTipWin.worldPos = CameraManager.uiCamera.ScreenToWorldPoint(Input.mousePosition);
                    SmallTipWin.isDownShow = true;
                    UIManager.Instance.OpenWindowAsync<SmallTipWin>().Forget();
                }).Forget();
                    UIManager.Instance.OpenWindow<SmallTipWin>();
                });
            }
            else
            {

 Main/System/HeroTrial/HeroTrialCell.cs

@@ -67,7 +67,7 @@
            var skinConfig = HeroSkinConfig.Get(skinID);
            if (skinConfig != null)
            {
                UILoader.LoadSprite("HeroHead", skinConfig.SquareIcon, heroHeadImage, "herohead_default").Forget();
                heroHeadImage.sprite = UILoader.LoadSprite("HeroHead", skinConfig.SquareIcon);
            }
        }
    }
@@ -85,7 +85,7 @@
            {
                int itemID = awards[i][0];
                itemCells[i].Init(new ItemCellModel(awards[i][0], true, awards[i][1]));
                itemCells[i].SetClickListener(() => ItemTipUtility.Show(itemID));
                itemCells[i].button.SetListener(() => ItemTipUtility.Show(itemID));
            }
        }
    }

 Main/System/HeroTrial/HeroTrialFailWin.cs

@@ -26,7 +26,7 @@
        tipHeroPosBtn.AddListener(() =>
        {
            CloseWindow();
            UIManager.Instance.OpenWindowAsync<HeroPosWin>().Forget();
            UIManager.Instance.OpenWindow<HeroPosWin>();
        });

        detailBtn.SetListener(() =>

 Main/System/HeroTrial/HeroTrialHeroItem.cs

@@ -52,7 +52,7 @@
            int skinID = heroConfig.SkinIDList[0];
            var skinConfig = HeroSkinConfig.Get(skinID);
            if (skinConfig != null)
                UILoader.LoadSprite("HeroHead", skinConfig.SquareIcon, heroHeadImage, "herohead_default").Forget();
                heroHeadImage.sprite = UILoader.LoadSprite("HeroHead", skinConfig.SquareIcon);
        }

        UpdateLockState(heroConfig);

 Main/System/Settlement/BattleSettlementManager.cs

@@ -107,11 +107,11 @@
            case BattleConst.HeroTrialBattleField:
                if (isWin)
                {
                    UIManager.Instance.OpenWindowAsync<HeroTrialVictoryWin>().Forget();
                    UIManager.Instance.OpenWindow<HeroTrialVictoryWin>();
                }
                else
                {
                    UIManager.Instance.OpenWindowAsync<HeroTrialFailWin>().Forget();
                    UIManager.Instance.OpenWindow<HeroTrialFailWin>();
                }
                break;
            case BattleConst.TianziBillboradBattleField: