From ac93e899d5c6331e89ccae552ecbb502a9652d01 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 27 一月 2026 18:49:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Arena/ArenaWin.cs | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Main/System/Arena/ArenaWin.cs b/Main/System/Arena/ArenaWin.cs
index 1b3e140..c5da720 100644
--- a/Main/System/Arena/ArenaWin.cs
+++ b/Main/System/Arena/ArenaWin.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using UnityEngine;
+using UnityEngine.UI;
public class ArenaWin : UIBase
{
@@ -8,11 +9,13 @@
[SerializeField] ButtonEx btnAward;
[SerializeField] ButtonEx btnChallage;
[SerializeField] RedpointBehaviour rpChallage;
- [SerializeField] ButtonEx btnDeployTroops;
+ // [SerializeField] ButtonEx btnDeployTroops;
[SerializeField] List<ArenaPlayerTop3Cell> playerTop3Cells;
[SerializeField] ScrollerController scrollerController;
[SerializeField] ArenaPlayerRankCell myRankCell;
[SerializeField] ArenaChallengeVoucher voucher;
+ [SerializeField] Button funPresetBtn;
+
[HideInInspector] public int groupValue1 = 0; //涓�鑸敤浜庤法鏈�
[HideInInspector] public int groupValue2 = 0; //涓�鑸敤浜庤法鏈�
[HideInInspector] public string valueFormat = "{0}";
@@ -31,10 +34,9 @@
ArenaManager.Instance.SendArenaMatch();
UIManager.Instance.OpenWindow<ArenaChallengeWin>();
});
- btnDeployTroops.SetListener(() =>
+ funPresetBtn.AddListener(()=>
{
- HeroUIManager.Instance.selectTeamType = TeamManager.Instance.GetTeamID((int)BattlePreSetType.Arena);
- UIManager.Instance.OpenWindow<HeroPosWin>(1); // 绔炴妧鍦烘爣绛鹃〉
+ FuncPresetManager.Instance.ClickBattlePreset((int)BattlePreSetType.Arena);
});
}
@@ -44,6 +46,7 @@
RankModel.Instance.ResetQueryParam();
RankModel.Instance.QueryRankByPage(ArenaManager.Instance.rankType, watchID: (int)PlayerDatas.Instance.baseData.PlayerID);
rpChallage.redpointId = ArenaManager.Instance.GetRedPonitId(1);
+
}
protected override void NextFrameAfterOpen()
@@ -81,7 +84,7 @@
void DisplayDeployTroop()
{
bool isOpen = FuncOpen.Instance.IsFuncOpen(ArenaManager.Instance.DeployTroopsFuncId);
- btnDeployTroops.SetActive(isOpen);
+ // btnDeployTroops.SetActive(isOpen);
}
@@ -121,6 +124,8 @@
DisplayMyRank();
DisplayTop3();
DisplayDeployTroop();
+
+ funPresetBtn.SetActive(FuncPresetManager.Instance.IsPreShow());
}
void CreateScroller()
--
Gitblit v1.8.0