From 4b04baff631dfd22bda1898abbd02408049ece62 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 04 一月 2019 17:44:01 +0800
Subject: [PATCH] 5542 【1.4.100】骑宠争夺boss第四只（逍遥城）的boss修改为和平区域
---
System/MainInterfacePanel/PlayerMainDate.cs | 1 +
System/MainInterfacePanel/HeadPortraitTip.cs | 22 +++++++---------------
System/MainInterfacePanel/MainInterfaceWin.cs | 32 ++++++++++----------------------
3 files changed, 18 insertions(+), 37 deletions(-)
diff --git a/System/MainInterfacePanel/HeadPortraitTip.cs b/System/MainInterfacePanel/HeadPortraitTip.cs
index 813ea0d..a55e864 100644
--- a/System/MainInterfacePanel/HeadPortraitTip.cs
+++ b/System/MainInterfacePanel/HeadPortraitTip.cs
@@ -212,27 +212,19 @@
bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
if (atkInt.Length > 1)
{
- if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool)//閫嶉仴鍩巄oss鍖哄煙鐗规畩澶勭悊锛堝彲鍒囨崲鐘舵�侊級
+ if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && !fairyGrabBossModel.grabBossHintOpen)//閫嶉仴鍩巄oss鍖哄煙鐗规畩澶勭悊锛堝彲鍒囨崲鐘舵�侊級
{
- if (fairyGrabBossModel.grabBossHintOpen)//娲诲姩Boss涓嶈鍒囩姸鎬�
+ WindowCenter.Instance.Open<CombatModeWin>();
+ if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
{
- return;
+ WindowCenter.Instance.Close<FunctionForecastWin>();
}
- else
- {
- WindowCenter.Instance.Open<CombatModeWin>();
- if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
- {
- WindowCenter.Instance.Close<FunctionForecastWin>();
- }
- return;
- }
-
-
+ return;
}
var activityline = 0;
fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
- if (mapID == 10010 || mapID == 10020 || mapID == 10030)//Boss浜夊ず鎴樺墠涓夊彧淇濆簳鍙兘鏄拰骞虫ā寮�
+
+ if (onMainModel.ShieldedArea.Contains(mapID))//Boss浜夊ず鎴樺墠涓夊彧淇濆簳鍙兘鏄拰骞虫ā寮�
{
SysNotifyMgr.Instance.ShowTip("Map_AtkType");
return;
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 1cb3c73..000988b 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -566,35 +566,23 @@
var config = Config.Instance.Get<MapConfig>(mapID);
int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();
bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
- if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID))//鍓嶄笁鍙狟oss鍜屾椿鍔˙oss鐗规畩澶勭悊
+ if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && !fairyGrabBossModel.grabBossHintOpen)//閫嶉仴鍩庢櫘閫欱oss鍖哄煙澶勭悊
+ {
+ onMainModel.AreaState = Buffmodel.PkType;
+ DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
+ return;
+ }
+ if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID))//鍓嶅洓鍙狟oss鍜屾椿鍔˙oss鐗规畩澶勭悊
{
}
else
{
- if (mapID == 10040)
+ if (IsBossBool && atkInt.Length > 1 && Buffmodel.PkType != 5)
{
-
- if (!fairyGrabBossModel.grabBossHintOpen && IsBossBool)//boss鍖哄煙鍙互鍒囨崲鐘舵��
- {
- onMainModel.AreaState = Buffmodel.PkType;
- DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
- }
- else if (fairyGrabBossModel.grabBossHintOpen && IsBossBool)//娲诲姩boss涓嶈鍒�
- {
- DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)onMainModel.AreaState);
- }
+ onMainModel.AreaState = Buffmodel.PkType;
+ DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
}
- else
- {
- if (IsBossBool && atkInt.Length > 1 && Buffmodel.PkType != 5)
- {
- onMainModel.AreaState = Buffmodel.PkType;
- DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
- }
- }
-
-
}
}
diff --git a/System/MainInterfacePanel/PlayerMainDate.cs b/System/MainInterfacePanel/PlayerMainDate.cs
index e35d598..60864b8 100644
--- a/System/MainInterfacePanel/PlayerMainDate.cs
+++ b/System/MainInterfacePanel/PlayerMainDate.cs
@@ -165,6 +165,7 @@
ShieldedArea.Add(10010);
ShieldedArea.Add(10020);
ShieldedArea.Add(10030);
+ ShieldedArea.Add(10040);
string WaHuangHighestFloorStr= Config.Instance.Get<FuncConfigConfig>("WaHuangHighestFloor").Numerical1;
WaHuangHighestFloor = int.Parse(WaHuangHighestFloorStr);
ruinsTranscriptMapId = int.Parse(Config.Instance.Get<FuncConfigConfig>("SpRewardMapID").Numerical1);//濞茬殗鍦板浘ID
--
Gitblit v1.8.0