From 84fba9533cc9a0f1a3400bbc3f9a36cca94a1fbc Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 26 十二月 2025 18:30:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Arena/ArenaManager.cs | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/Main/System/Arena/ArenaManager.cs b/Main/System/Arena/ArenaManager.cs
index b9acc8d..d921a07 100644
--- a/Main/System/Arena/ArenaManager.cs
+++ b/Main/System/Arena/ArenaManager.cs
@@ -7,7 +7,8 @@
{
public readonly int rankType = 1; // 姒滃崟绫诲瀷
public readonly int funcId = 27; // 鍔熻兘Id
- public readonly int DeployTroopsFuncId = 32; // 甯冮樀鍔熻兘ID
+ public readonly int DeployTroopsFuncId = 31; // 甯冮樀鍔熻兘ID
+ public readonly int BattleChangeTabFuncId = 32; // 鎴樻枟鑳藉垏鎹㈤〉绛惧姛鑳絀D
public readonly int recType = 308; // 婕旀鍦虹帺瀹舵寫鎴樿褰曠被鍨� 308
public readonly int ChallengeMoneyType = 53;
public readonly int NeedChallengeMoneyCnt = 1;
@@ -26,6 +27,7 @@
public Dictionary<int, int[][]> seasonRankRewards; // 璧涘鎺掕濂栧姳 {"鍚嶆":[[鐗╁搧ID, 涓暟,鏄惁鎷嶅搧], ...], ...}
public uint score; // 褰撳墠绉垎
+ public int totalWinCnt; //绱鑳滃埄娆℃暟
public List<ArenaMatchInfo> matchInfoList = new List<ArenaMatchInfo>();
//鐢ㄤ簬鐢ㄦ潵鎷挎垬鏂楄儨鍒╁け璐ョ殑澶村儚淇℃伅
@@ -40,7 +42,7 @@
public event Action OnUpdateGameRecInfo;
public override void Init()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += BeforePlayerDataInitializeEventOnRelogin;
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
InitTable();
InitRedpoint();
@@ -48,15 +50,14 @@
public override void Release()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= BeforePlayerDataInitializeEventOnRelogin;
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
}
- public void OnBeforePlayerDataInitializeEvent()
+ public void BeforePlayerDataInitializeEventOnRelogin()
{
matchInfoList.Clear();
gameRecDict.Clear();
- allFaceInfoDict.Clear();
}
void InitRedpoint()
@@ -120,7 +121,7 @@
public int GetMaxChallengeCount()
{
- return challengeTicketLimit;
+ return challengeTicketLimit + InvestModel.Instance.GetArenaAddMaxCount();
}
public void OnArenaMatchList(HA922_tagSCArenaMatchList vNetData)
@@ -155,6 +156,7 @@
if (vNetData == null)
return;
this.score = vNetData.Score;
+ totalWinCnt = (int)vNetData.WinCnt;
OnUpdateArenaPlayerInfo?.Invoke();
}
public void UpdateGameRecInfo(HA009_tagSCGameRecInfo vNetData)
@@ -218,7 +220,7 @@
public Dictionary<int, int[][]> GetArenaAwardDict(int functionOrder)
{
- return functionOrder == 0 ? dailyRankRewards : seasonRankRewards;
+ return functionOrder == 0 ? seasonRankRewards : dailyRankRewards;
}
public void SendViewGameRecPack()
@@ -232,15 +234,6 @@
{
CB209_tagCSArenaMatch pack = new CB209_tagCSArenaMatch();
pack.IsRefresh = isRefresh ? (byte)1 : (byte)0;
- GameNetSystem.Instance.SendInfo(pack);
- }
-
- public void SendTurnFight(uint playerID)
- {
- CB410_tagCMTurnFight pack = new CB410_tagCMTurnFight();
- pack.MapID = 3;
- pack.TagType = 1;
- pack.TagID = playerID;
GameNetSystem.Instance.SendInfo(pack);
}
--
Gitblit v1.8.0