From e925d587dbed71de9c0275cb31e15ecbc0265fdd Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 19 三月 2019 15:36:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/MainInterfacePanel/PlayerMainDate.cs |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/System/MainInterfacePanel/PlayerMainDate.cs b/System/MainInterfacePanel/PlayerMainDate.cs
index 20d7d64..4fa4a16 100644
--- a/System/MainInterfacePanel/PlayerMainDate.cs
+++ b/System/MainInterfacePanel/PlayerMainDate.cs
@@ -133,6 +133,8 @@
     //---------璁板綍涓荤晫闈op闈㈡澘鏄惁鍦ㄥ彲瑙佷綅缃�
     public bool MainTopPanelShow = true;
 
+    public event Func<bool> customDisplayPower;
+
     public override void Init()
     {
         IsTipBool = true;
@@ -383,12 +385,15 @@
             {
                 ProwNumAdd = power - prowNum;
                 prowNum = power;
+                if (customDisplayPower != null && customDisplayPower())
+                {
+                    return;
+                }
                 if (WindowCenter.Instance.IsOpen<PowerAddWin>())
                 {
                     WindowCenter.Instance.CloseImmediately("PowerAddWin");
                 }
                 WindowCenter.Instance.Open<PowerAddWin>();
-
             }
             else
             {
@@ -397,20 +402,16 @@
         }
     }
 
-    public void FabaoPowerAdd(int power)
+    public void CustomPowerUp(int power)
     {
         ProwNumAdd = power;
         if (WindowCenter.Instance.IsOpen<PowerAddWin>())
         {
             WindowCenter.Instance.Close<PowerAddWin>();
-           
-        }
-        if (prowNum != 0)
-        {
-            prowNum += power;
         }
         WindowCenter.Instance.Open<PowerAddWin>();
     }
+
     public void KissMonsterExperience(int _source, int _ExpPoint, int _Exp)//锛�1.鍗曚綅缁忛獙浜跨偣锛�2.缁忛獙鍗曚綅鐐癸級
     {
         if (Event_Experience != null)

--
Gitblit v1.8.0