From 71c3e459965f5442ca704eec64451316910f1732 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 17 十二月 2025 12:05:14 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/BattleDetail/BattleDetailWin.cs | 14 +++++++-------
Main/System/BattleDetail/BattleDetailHeroInfoItem.cs | 6 +++---
Main/System/Battle/BattleManager.cs | 5 ++---
Main/System/Settlement/BattleSettlementManager.cs | 6 +++---
Main/System/Settlement/TianziBillboradVictoryWin.cs | 1 +
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Main/System/Battle/BattleManager.cs b/Main/System/Battle/BattleManager.cs
index cb7df74..921999b 100644
--- a/Main/System/Battle/BattleManager.cs
+++ b/Main/System/Battle/BattleManager.cs
@@ -346,6 +346,7 @@
PackageRegedit.Distribute(pack);
}
+ return true;
}
catch (Exception ex)
{
@@ -355,10 +356,8 @@
{
packQueue.Dequeue();
}
- return false;
+ return packQueue.Count > 0;
}
-
- return packQueue.Count > 0;
}
public void OnConnected()
diff --git a/Main/System/BattleDetail/BattleDetailHeroInfoItem.cs b/Main/System/BattleDetail/BattleDetailHeroInfoItem.cs
index 5e856ee..49e13b5 100644
--- a/Main/System/BattleDetail/BattleDetailHeroInfoItem.cs
+++ b/Main/System/BattleDetail/BattleDetailHeroInfoItem.cs
@@ -61,9 +61,9 @@
txtLV.text = StringUtility.Concat(Language.Get("L1094"), info.LV.ToString());
DisplayStars(info.Star);
- DisplaySlider(imgAtkHurt, txtAtkHurt, info.AtkHurt, data.maxAtk);
- DisplaySlider(imgDefHurt, txtDefHurt, info.DefHurt, data.maxDef);
- DisplaySlider(imgCureHP, txtCureHP, info.CureHP, data.maxCure);
+ DisplaySlider(imgAtkHurt, txtAtkHurt, (ulong)info.AtkHurt, data.maxAtk);
+ DisplaySlider(imgDefHurt, txtDefHurt, (ulong)info.DefHurt, data.maxDef);
+ DisplaySlider(imgCureHP, txtCureHP, (ulong)info.CureHP, data.maxCure);
}
diff --git a/Main/System/BattleDetail/BattleDetailWin.cs b/Main/System/BattleDetail/BattleDetailWin.cs
index 78e6268..79a8a85 100644
--- a/Main/System/BattleDetail/BattleDetailWin.cs
+++ b/Main/System/BattleDetail/BattleDetailWin.cs
@@ -75,7 +75,7 @@
for (int i = 0; i < infos.Count; i++)
{
BattleDetailHeroInfo nowInfo = infos[i];
- ulong nowValue = nowInfo.AtkHurt + nowInfo.DefHurt + nowInfo.CureHP;
+ ulong nowValue = (ulong)nowInfo.AtkHurt + (ulong)nowInfo.DefHurt + (ulong)nowInfo.CureHP;
if (nowValue > mvpScore)
{
mvpIndex = i;
@@ -96,12 +96,12 @@
for (int i = 0; i < infos.Count; i++)
{
BattleDetailHeroInfo nowInfo = infos[i];
- if (nowInfo.AtkHurt > maxAtk)
- maxAtk = nowInfo.AtkHurt;
- if (nowInfo.DefHurt > maxDef)
- maxDef = nowInfo.DefHurt;
- if (nowInfo.CureHP > maxCure)
- maxCure = nowInfo.CureHP;
+ if ((ulong)nowInfo.AtkHurt > maxAtk)
+ maxAtk = (ulong)nowInfo.AtkHurt;
+ if ((ulong)nowInfo.DefHurt > maxDef)
+ maxDef = (ulong)nowInfo.DefHurt;
+ if ((ulong)nowInfo.CureHP > maxCure)
+ maxCure = (ulong)nowInfo.CureHP;
}
}
}
diff --git a/Main/System/Settlement/BattleSettlementManager.cs b/Main/System/Settlement/BattleSettlementManager.cs
index d7d0bf5..1b324a9 100644
--- a/Main/System/Settlement/BattleSettlementManager.cs
+++ b/Main/System/Settlement/BattleSettlementManager.cs
@@ -395,9 +395,9 @@
public int LV; // 姝﹀皢绛夌骇
public int Star; // 姝﹀皢鏄熺骇
public int Skin; // 姝﹀皢鐨偆ID
- public ulong DefHurt; // 鎬绘壙浼�
- public ulong CureHP; // 鎬绘不鐤�
- public ulong AtkHurt; // 鎬昏緭鍑�
+ public long DefHurt; // 鎬绘壙浼�
+ public long CureHP; // 鎬绘不鐤�
+ public long AtkHurt; // 鎬昏緭鍑�
public int Dead; // 鏄惁闃典骸
}
diff --git a/Main/System/Settlement/TianziBillboradVictoryWin.cs b/Main/System/Settlement/TianziBillboradVictoryWin.cs
index a1d154d..511bacc 100644
--- a/Main/System/Settlement/TianziBillboradVictoryWin.cs
+++ b/Main/System/Settlement/TianziBillboradVictoryWin.cs
@@ -22,6 +22,7 @@
{
base.OnPreOpen();
isSweepVictory = TianziBillboradManager.Instance.isSweepVictory;
+ detailBtn.SetActive(!isSweepVictory);
scroller.OnRefreshCell += OnRefreshCell;
CreateScroller();
Display();
--
Gitblit v1.8.0