From aae092fccd5bb4468a43804264956d74b05b5d93 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 30 八月 2018 20:38:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/CombatModeWin.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/System/MainInterfacePanel/CombatModeWin.cs b/System/MainInterfacePanel/CombatModeWin.cs
index fee363e..54a6339 100644
--- a/System/MainInterfacePanel/CombatModeWin.cs
+++ b/System/MainInterfacePanel/CombatModeWin.cs
@@ -31,7 +31,10 @@
PlayerBuffDatas m_BuffModel;
PlayerBuffDatas Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>()); } }
PKModel m_PKModel;
- PKModel pKModel { get { return m_PKModel ?? (m_PKModel = ModelCenter.Instance.GetModel<PKModel>()); } }
+ PKModel pKModel { get { return m_PKModel ?? (m_PKModel = ModelCenter.Instance.GetModel<PKModel>()); } }
+ FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
+ PlayerMainDate m_MainModel;
+ PlayerMainDate onMainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }
protected override void BindController()
{
string PkStr = Config.Instance.Get<FuncConfigConfig>("PKText").Numerical1;
@@ -46,8 +49,8 @@
protected override void OnPreOpen()
{
int MapID = PlayerDatas.Instance.baseData.MapID;
- var config = Config.Instance.Get<MapConfig>(MapID);
- AtkTypeList = pKModel.GetArea(config.AtkType).ToArray();
+ var config = Config.Instance.Get<MapConfig>(MapID);
+ AtkTypeList = pKModel.GetArea(config.AtkType).ToArray();
_PkType = Buffmodel.PkType;//鑾峰彇褰撳墠PK鐘舵��
if (_PkType != 2)
{
@@ -96,9 +99,21 @@
else
_PkButton.ElectImage.SetActive(false);
TextSwitch(cell.index, _PkButton.Model, _PkButton.ContentText);
- _PkButton.StateSelection.RemoveAllListeners();
+ _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();
});
--
Gitblit v1.8.0