From 973edc44a04dceb8b48a32ca912e6167f86189d4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 25 八月 2025 17:38:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Main/PlayerMainDate.cs | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/Main/System/Main/PlayerMainDate.cs b/Main/System/Main/PlayerMainDate.cs
index 2711a38..83a542b 100644
--- a/Main/System/Main/PlayerMainDate.cs
+++ b/Main/System/Main/PlayerMainDate.cs
@@ -47,36 +47,21 @@
}
- 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;
- isAdd = true;
- if (customDisplayPower != null && customDisplayPower())
- {
- return;
- }
- if (UIManager.Instance.IsOpened<PowerAddWin>())
- {
- AddPowerEvent?.Invoke();
- return;
- }
- UIManager.Instance.OpenWindow<PowerAddWin>();
- }
- else if ((long)power < prowNum)
- {
- prowNumChange = prowNum - (long)power;
- prowNum = (long)power;
- isAdd = false;
+ prowNumChange = power - prowNum;
+ prowNum = power;
+ isAdd = prowNumChange > 0;
+ prowNumChange = Math.Abs(prowNumChange);
if (customDisplayPower != null && customDisplayPower())
{
return;
@@ -90,7 +75,7 @@
}
else
{
- prowNum = (long)power;
+ prowNum = power;
}
}
}
@@ -108,7 +93,34 @@
// UIManager.Instance.OpenWindow<PowerAddWin>();
// }
-
+ /// <summary>
+ /// 姝﹀皢鑷韩鐨勬垬鍔涘彉鍖�
+ /// </summary>
+ /// <param name="hero"></param>
+ public void AddPowerNotOnTeam(HeroInfo hero)
+ {
+ if (HeroUIManager.Instance.lastFightPower.Key != hero.itemHero.guid)
+ {
+ return;
+ }
+
+ if (hero.IsInTeamByTeamType(TeamType.Story))
+ {
+ return;
+ }
+
+ prowNumChange = hero.CalculatePower() - 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();
+ return;
+ }
+ UIManager.Instance.OpenWindow<PowerAddWin>();
+ }
}
--
Gitblit v1.8.0