From 178f2157c26aed703fee12d493acc85d3b512934 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 01 三月 2025 22:14:51 +0800
Subject: [PATCH] 10349 【越南】【英文】【BT】【砍树】跨服竞技场优化 - 查看比赛积分
---
LogicProject/System/CrossServerQualifying/CrossServerQualifying8Win.cs | 78 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/LogicProject/System/CrossServerQualifying/CrossServerQualifying8Win.cs b/LogicProject/System/CrossServerQualifying/CrossServerQualifying8Win.cs
index 0c3358d..36917e6 100644
--- a/LogicProject/System/CrossServerQualifying/CrossServerQualifying8Win.cs
+++ b/LogicProject/System/CrossServerQualifying/CrossServerQualifying8Win.cs
@@ -45,6 +45,11 @@
Text todayRaceText;
Button littleCloseBtn;
+ Button finalsBtn; //鏌ョ湅鍐宠禌绉垎鎸夐挳
+ RectTransform queryScoreObj;
+ Text queryScoreText;
+
+
#region Built-in
protected override void BindController()
{
@@ -89,6 +94,10 @@
todayRaceObj = proxy.GetWidgtEx<RectTransform>("raceTip");
todayRaceText = proxy.GetWidgtEx<Text>("todayrace");
littleCloseBtn = proxy.GetWidgtEx<Button>("littleClose");
+
+ finalsBtn = proxy.GetWidgtEx<Button>("finalsBtn");
+ queryScoreObj = proxy.GetWidgtEx<RectTransform>("scoreTip");
+ queryScoreText = proxy.GetWidgtEx<Text>("scoreText");
}
protected override void AddListeners()
@@ -113,10 +122,22 @@
CrossServerQualifyingModel.Instance.isShowRaceInfoYet = true;
todayRaceObj.SetActive(!CrossServerQualifyingModel.Instance.isShowRaceInfoYet);
});
+
+ finalsBtn.AddListener(() => {
+ uint playerID = 0;
+ var battle = CrossServerQualifyingModel.Instance.battleInfo[2];
+ if (battle.Count > 0)
+ {
+ var playerIDs = battle[battle.Keys.ToList()[0]];
+ playerID = playerIDs.PlayerIDA == 0 ? playerIDs.PlayerIDB : playerIDs.PlayerIDA;
+ }
+ QueryRaceScoreEvent(playerID, 2);
+ });
}
protected override void OnPreOpen()
{
+ CrossServerQualifyingModel.Instance.QueryRaceScoreEvent += QueryRaceScoreEvent;
GlobalTimeEvent.Instance.minuteEvent += OnMinuteEvent;
CrossServerQualifyingModel.Instance.UpdateCrossChampionshipPKZoneGroupInfoEvent += UpdateRace;
@@ -142,6 +163,7 @@
failAGrayImg.SetActiveIL(false);
failBGrayImg.SetActiveIL(false);
+ queryScoreObj.SetActiveIL(false);
}
protected override void OnAfterOpen()
{
@@ -167,6 +189,7 @@
protected override void OnPreClose()
{
+ CrossServerQualifyingModel.Instance.QueryRaceScoreEvent -= QueryRaceScoreEvent;
GlobalTimeEvent.Instance.minuteEvent -= OnMinuteEvent;
CrossServerQualifyingModel.Instance.UpdateCrossChampionshipPKZoneGroupInfoEvent -= UpdateRace;
}
@@ -279,7 +302,7 @@
{
var playerID = i >= player8List.Count ? new Int2(0, 0) : player8List[i];
var _cell = players8[i].GetILBehaviour<CSQShootOutPlayerCell>();
- _cell.Display((uint)playerID.x, (uint)playerID.y);
+ _cell.Display((uint)playerID.x, (uint)playerID.y, 8);
}
//4寮�
@@ -299,7 +322,7 @@
{
var playerID = i >= player4List.Count ? new Int2(0, 0) : player4List[i];
var _cell = players4[i].GetILBehaviour<CSQShootOutPlayerCell>();
- _cell.Display((uint)playerID.x, (uint)playerID.y);
+ _cell.Display((uint)playerID.x, (uint)playerID.y, 4);
}
}
else
@@ -441,6 +464,57 @@
{
DisplayRace();
}
+ }
+
+ void QueryRaceScoreEvent(uint playerID, uint groupMark)
+ {
+ if (groupMark == 0 || playerID == 0)
+ {
+ todayRaceObj.SetActiveIL(false);
+ queryScoreObj.SetActiveIL(false);
+ return;
+ }
+
+ var battleInfo = CrossServerQualifyingModel.Instance.QueryPKScoreInfoByPlayerID(groupMark, playerID);
+ if (battleInfo.PlayerIDA == 0 || battleInfo.PlayerIDB == 0)
+ {
+ todayRaceObj.SetActiveIL(false);
+ queryScoreObj.SetActiveIL(false);
+ return;
+ }
+
+ todayRaceObj.SetActiveIL(false);
+ queryScoreObj.SetActiveIL(true);
+
+ int tagScoreA = 0;
+ int tagScoreB = 0;
+ var battleResult = battleInfo.battleResult;
+ var keys = battleResult.Keys.ToList();
+ for (int i = 0; i < keys.Count; i++)
+ {
+ var key = keys[i];
+ if (key == battleInfo.PlayerIDA)
+ {
+ for (int j = 0; j < battleResult[key].Length; j++)
+ {
+ tagScoreA += battleResult[key][j][1];
+ }
+ }
+ else
+ {
+ for (int j = 0; j < battleResult[key].Length; j++)
+ {
+ tagScoreB += battleResult[key][j][1];
+ }
+ }
+ }
+
+ var nameA = CrossServerQualifyingModel.Instance.fightersInfo.ContainsKey(battleInfo.PlayerIDA) ? CrossServerQualifyingModel.Instance.fightersInfo[battleInfo.PlayerIDA].PlayerName : Language.Get("UnDetermind");
+ var nameB = CrossServerQualifyingModel.Instance.fightersInfo.ContainsKey(battleInfo.PlayerIDB) ? CrossServerQualifyingModel.Instance.fightersInfo[battleInfo.PlayerIDB].PlayerName : Language.Get("UnDetermind");
+
+ queryScoreText.text = StringUtility.Contact(nameA, UIHelper.AppendColor(TextColType.NavyYellow, " VS "), nameB, "</r>",
+ Language.Get("L2033"), " ", tagScoreA, " - ", tagScoreB);
}
+
}
--
Gitblit v1.8.0