From 6e6db61a11186d9a616488b761b93fc7f0ccef6c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 03 九月 2018 16:54:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/CombatModeWin.cs | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/System/MainInterfacePanel/CombatModeWin.cs b/System/MainInterfacePanel/CombatModeWin.cs
index 7304a97..820609b 100644
--- a/System/MainInterfacePanel/CombatModeWin.cs
+++ b/System/MainInterfacePanel/CombatModeWin.cs
@@ -50,7 +50,9 @@
{
int MapID = PlayerDatas.Instance.baseData.MapID;
var config = Config.Instance.Get<MapConfig>(MapID);
- if (fairyGrabBossModel.grabBossHintOpen)//鍐嶅墠鍥涚珷鏂版墜鍦板浘涓斿湪娲诲姩鍖哄煙
+ var activityline = 0;
+ fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
+ if (activityline == PlayerDatas.Instance.baseData.FBID)//鍐嶅墠鍥涚珷鏂版墜鍦板浘涓斿湪娲诲姩鍖哄煙
{
AtkTypeList = new int[] { 0, 5 };
}
@@ -110,18 +112,7 @@
_PkButton.StateSelection.RemoveAllListeners();
bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
_PkButton.StateSelection.AddListener(() =>
- {
- if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool)//寰″墤灞卞簞boss鍖哄煙鐗规畩澶勭悊锛堝彲鍒囨崲鐘舵�侊級
- {
- DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)cell.index);
- Close();
- return;
- }
- if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && !fairyGrabBossModel.grabBossHintOpen)//鍐嶅墠鍥涚珷鏂版墜鍦板浘涓斾笉鍦ㄦ椿鍔ㄥ尯鍩�
- {
- Close();//涓嶅厑璁稿垏鎹�
- return;
- }
+ {
DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)cell.index);
Close();
});
@@ -166,12 +157,8 @@
break;
default:
break;
-
-
}
-
}
-
}
--
Gitblit v1.8.0