From dc7922d80c1d133b6261b8af1d521567d2c0a35d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 30 十月 2025 16:51:39 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/Main/PlayerMainDate.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Main/System/Main/PlayerMainDate.cs b/Main/System/Main/PlayerMainDate.cs
index b3d69bf..a35504f 100644
--- a/Main/System/Main/PlayerMainDate.cs
+++ b/Main/System/Main/PlayerMainDate.cs
@@ -18,7 +18,7 @@
//--------------------鐢ㄤ簬鎴樻枟鍔涙粴鍔�
- public long prowNum = 0;
+ public long prowNum = 0; //婊氬姩鍓嶆垬鍔涳紝鏈�鍚庝竴娆℃垬鍔�
public long prowNumChange = 0;
public bool isAdd = true;//涓簍rue澧炲姞 涓篺alse鍑忓皯
private bool prowBool = true;
@@ -47,19 +47,19 @@
}
- public void PowerAdd(ulong power)
+ public void PowerAdd(long power)
{
if (prowBool)
{
- prowNum = (long)power;
+ prowNum = power;
prowBool = false;
}
else
{
- if ((long)power != prowNum)
+ if (power != prowNum)
{
- prowNumChange = (long)power - prowNum;
- prowNum = (long)power;
+ prowNumChange = power - prowNum;
+ prowNum = power;
isAdd = prowNumChange > 0;
prowNumChange = Math.Abs(prowNumChange);
if (customDisplayPower != null && customDisplayPower())
@@ -75,7 +75,7 @@
}
else
{
- prowNum = (long)power;
+ prowNum = power;
}
}
}
@@ -99,7 +99,7 @@
/// <param name="hero"></param>
public void AddPowerNotOnTeam(HeroInfo hero)
{
- if (HeroUIManager.Instance.lastFightPower.Key != hero.heroId)
+ if (HeroUIManager.Instance.lastFightPower.Key != hero.itemHero.guid)
{
return;
}
@@ -109,10 +109,11 @@
return;
}
- prowNumChange = hero.CalculatePower() - HeroUIManager.Instance.lastFightPower.Value;
+ prowNum = hero.CalculateFightPower();
+ prowNumChange = prowNum - HeroUIManager.Instance.lastFightPower.Value;
+ HeroUIManager.Instance.lastFightPower = new KeyValuePair<string, long>();
isAdd = prowNumChange > 0;
prowNumChange = Math.Abs(prowNumChange);
- prowNum = hero.CalculatePower();
if (UIManager.Instance.IsOpened<PowerAddWin>())
{
AddPowerEvent?.Invoke();
--
Gitblit v1.8.0