From 9e89e605d5429babb4b33df2e47ea86dff9d2ba7 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 20 十一月 2025 11:55:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Main/PlayerMainDate.cs |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Main/System/Main/PlayerMainDate.cs b/Main/System/Main/PlayerMainDate.cs
index 83a542b..274bb09 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;
@@ -49,6 +49,14 @@
 
     public void PowerAdd(long power)
     {
+        if (UIManager.Instance.IsOpened<NewBieWin>() )
+        {
+            if (UIManager.Instance.GetUI<NewBieWin>().IsFuncOpenGuide())
+            {
+                return;
+            }
+        }
+
         if (prowBool)
         {
             prowNum = power;
@@ -109,11 +117,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