From 19940e0b76a0038826ad04e4bcc93574ee554017 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 03 九月 2018 16:50:54 +0800
Subject: [PATCH] 3220 前端 BOSS活动线PK状态逻辑修改
---
System/MainInterfacePanel/CombatModeWin.cs | 21 ++++-----------------
System/MainInterfacePanel/HeadPortraitTip.cs | 12 ++++--------
System/MainInterfacePanel/MainInterfaceWin.cs | 16 ----------------
3 files changed, 8 insertions(+), 41 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;
-
-
}
-
}
-
}
diff --git a/System/MainInterfacePanel/HeadPortraitTip.cs b/System/MainInterfacePanel/HeadPortraitTip.cs
index 216ff65..79b1b35 100644
--- a/System/MainInterfacePanel/HeadPortraitTip.cs
+++ b/System/MainInterfacePanel/HeadPortraitTip.cs
@@ -190,6 +190,7 @@
private void OnSwitchAttackMode(E_AttackMode obj)//PK鐘舵�佸垏鎹�
{
TextSwitch((int)obj);
+
}
void PatternButton(GameObject obj)
{
@@ -208,7 +209,9 @@
}
return;
}
- if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && !fairyGrabBossModel.grabBossHintOpen)//鍐嶅墠鍥涚珷鏂版墜鍦板浘涓斾笉鍦ㄦ椿鍔ㄥ尯鍩�
+ var activityline = 0;
+ fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
+ if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && activityline!=PlayerDatas.Instance.baseData.FBID)//鍐嶅墠鍥涚珷鏂版墜鍦板浘涓斾笉鍦ㄦ椿鍔ㄥ尯鍩�
{
SysNotifyMgr.Instance.ShowTip("Map_AtkType");
return;
@@ -224,7 +227,6 @@
{
SysNotifyMgr.Instance.ShowTip("Map_AtkType");
}
-
}
void TextSwitch(int _EnumType)
{
@@ -270,10 +272,7 @@
break;
default:
break;
-
-
}
-
}
void BuffButton(GameObject obj)
@@ -394,10 +393,7 @@
break;
default:
break;
-
}
-
-
}
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index edc2367..9f68072 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -1056,22 +1056,6 @@
private void bossGrabHintEvent()
{
IsShowTaskPanel();
- int mapID = PlayerDatas.Instance.baseData.MapID;
- var config = Config.Instance.Get<MapConfig>(mapID);
- if (fairyGrabBossModel.grabBossHintOpen)
- {
- if (Buffmodel.PkType != config.Camp)
- {
- DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)config.Camp);
- }
- }
- else
- {
- if (Buffmodel.PkType != config.Camp)
- {
- DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)config.Camp);
- }
- }
}
}
--
Gitblit v1.8.0