From 605a8938233a9490693d219c1771ecdff89c1123 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 十二月 2018 15:36:06 +0800
Subject: [PATCH] Merge branch 'master' into 【1.4】聚魂功能
---
System/MainInterfacePanel/MainInterfaceWin.cs | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index e94559d..e0dc38c 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -513,22 +513,7 @@
if ((_areaType == MapArea.E_Type.Neutral || _areaType == MapArea.E_Type.Boss) && _enter)
{
WindowCenter.Instance.Open<NeutralMarkWin>();
- int mapID = PlayerDatas.Instance.baseData.MapID;
- var config = Config.Instance.Get<MapConfig>(mapID);
- int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();
- if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID) || fairyGrabBossModel.grabBossHintOpen)
- {
- //return;
- }
- else
- {
- if (atkInt.Length > 1 && Buffmodel.PkType != 5)
- {
- onMainModel.AreaState = Buffmodel.PkType;
- DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
- }
- }
-
+ AtkTypeChange();
}
if (_areaType == MapArea.E_Type.Neutral && !_enter)
@@ -583,6 +568,25 @@
}
}
+ private void AtkTypeChange()//楠戝疇浜夊ず鏄惁鍒囨崲鐘舵��
+ {
+ int mapID = PlayerDatas.Instance.baseData.MapID;
+ var config = Config.Instance.Get<MapConfig>(mapID);
+ int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();
+ if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID))
+ {
+
+ }
+ else
+ {
+ if (fairyGrabBossModel.grabBossHintOpen && atkInt.Length > 1 && Buffmodel.PkType != 5)
+ {
+ onMainModel.AreaState = Buffmodel.PkType;
+ DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
+ }
+ }
+
+ }
private void OnMaininterCDTime()
{
MarkRayButton();
@@ -1152,6 +1156,7 @@
{
IsShowTaskPanel();
ShowFairyGrabBoss();
+ AtkTypeChange();
}
private void ShowFairyGrabBoss()
--
Gitblit v1.8.0