From 3e557bd74ed693c973c0568838bfcafd46c1b490 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 27 十一月 2018 16:08:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainInterfaceWin.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 9e06b14..fa4f5b9 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -501,7 +501,7 @@
private void OnEnterOrExitArea(MapArea.E_Type _areaType, bool _enter)
{
- // DesignDebug.LogError(_areaType + ".." + _enter);
+ //DebugEx.LogError(_areaType + ".." + _enter);
if (PlayerDatas.Instance.baseData.MapID == 10040 && _areaType != MapArea.E_Type.Boss && _enter)
{
DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)onMainModel.AreaState);
@@ -515,15 +515,18 @@
int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();
if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID) || fairyGrabBossModel.grabBossHintOpen)
{
- return;
+ //return;
}
- if (atkInt.Length > 1 && Buffmodel.PkType != 5)
+ else
{
- onMainModel.AreaState = Buffmodel.PkType;
- DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
+ if (atkInt.Length > 1 && Buffmodel.PkType != 5)
+ {
+ onMainModel.AreaState = Buffmodel.PkType;
+ DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
+ }
}
+
}
-
if (_areaType == MapArea.E_Type.Neutral && !_enter)
{
--
Gitblit v1.8.0