From e9d27628b32af710d2e5f44460dedbd4c0b17033 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 18 三月 2019 16:41:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/PlayerMainDate.cs | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerMainDate.cs b/System/MainInterfacePanel/PlayerMainDate.cs
index a237a5c..20d7d64 100644
--- a/System/MainInterfacePanel/PlayerMainDate.cs
+++ b/System/MainInterfacePanel/PlayerMainDate.cs
@@ -104,9 +104,6 @@
{
WindowCenter.Instance.Get<MainInterfaceWin>().IsShowButtonGroup();
}
- //-----鏄惁鍦ㄨ嚜鍔ㄥ己鍖栦腑
- public bool StrengthegingBool = false;//鏄惁鍐嶈嚜鍔ㄥ己鍖栦腑
- public int StrengthegingAddFight = 0;//瀛樺彇闇�瑕佹坊鍔犵殑鎴樻枟鍔涘��
// --鐢ㄤ簬浠诲姟浠欑帀涓嶈冻璐拱椋為瀷
public bool IsFlyShoseBool = false;
public int FlyShoseTaskID = 0;
@@ -296,8 +293,6 @@
{
FlyShoseTaskID = 0;
IsFlyShoseBool = false;
- StrengthegingAddFight = 0;
- StrengthegingBool = false;
IsTipBool = true;
prowNum = 0;
ProwNumAdd = 0;
@@ -387,19 +382,12 @@
if (power > prowNum)
{
ProwNumAdd = power - prowNum;
- if (StrengthegingBool || StrengthegingAddFight != 0)
- {
- StrengthegingAddFight += ProwNumAdd;
- }
prowNum = power;
- if (!StrengthegingBool && StrengthegingAddFight == 0)
+ if (WindowCenter.Instance.IsOpen<PowerAddWin>())
{
- if (WindowCenter.Instance.IsOpen<PowerAddWin>())
- {
- WindowCenter.Instance.Close<PowerAddWin>();
- }
- WindowCenter.Instance.Open<PowerAddWin>();
+ WindowCenter.Instance.CloseImmediately("PowerAddWin");
}
+ WindowCenter.Instance.Open<PowerAddWin>();
}
else
@@ -407,18 +395,6 @@
prowNum = power;
}
}
- }
-
- IEnumerator LoadingIE()
- {
- yield return new WaitForSeconds(0.5f);
- ProwNumAdd = StrengthegingAddFight;
- StrengthegingAddFight = 0;
- if (WindowCenter.Instance.IsOpen<PowerAddWin>())
- {
- WindowCenter.Instance.Close<PowerAddWin>();
- }
- WindowCenter.Instance.Open<PowerAddWin>();
}
public void FabaoPowerAdd(int power)
--
Gitblit v1.8.0