From 1e08f6ae1a718b6c94a5d6d84bba5e0cf8115b3f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 23 四月 2019 10:43:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HeadPortraitTip.cs | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/System/MainInterfacePanel/HeadPortraitTip.cs b/System/MainInterfacePanel/HeadPortraitTip.cs
index c4faa37..4d97271 100644
--- a/System/MainInterfacePanel/HeadPortraitTip.cs
+++ b/System/MainInterfacePanel/HeadPortraitTip.cs
@@ -189,22 +189,22 @@
bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
if (atkInt.Length > 1)
{
- var activityline = 0;
- fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
- if (PlayerDatas.Instance.baseData.MapID == 10040 && activityline == PlayerDatas.Instance.baseData.FBID)//閫嶉仴鍩庢椿鍔ㄧ嚎涓嶅厑璁稿垏鎹㈡ā寮�
- {
- SysNotifyMgr.Instance.ShowTip("Map_AtkType");
- return;
- }
- if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && !fairyGrabBossModel.grabBossHintOpen)//閫嶉仴鍩巄oss鍖哄煙鐗规畩澶勭悊锛堝彲鍒囨崲鐘舵�侊級
- {
- WindowCenter.Instance.Open<CombatModeWin>();
- if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
- {
- WindowCenter.Instance.Close<FunctionForecastWin>();
- }
- return;
- }
+ //var activityline = 0;
+ //fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
+ //if (PlayerDatas.Instance.baseData.MapID == 10040 && activityline == PlayerDatas.Instance.baseData.FBID)//閫嶉仴鍩庢椿鍔ㄧ嚎涓嶅厑璁稿垏鎹㈡ā寮�
+ //{
+ // SysNotifyMgr.Instance.ShowTip("Map_AtkType");
+ // return;
+ //}
+ //if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && !fairyGrabBossModel.grabBossHintOpen)//閫嶉仴鍩巄oss鍖哄煙鐗规畩澶勭悊锛堝彲鍒囨崲鐘舵�侊級
+ //{
+ // WindowCenter.Instance.Open<CombatModeWin>();
+ // if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
+ // {
+ // WindowCenter.Instance.Close<FunctionForecastWin>();
+ // }
+ // return;
+ //}
if (onMainModel.ShieldedArea.Contains(mapID))//Boss浜夊ず鎴樺墠涓夊彧淇濆簳鍙兘鏄拰骞虫ā寮�
{
@@ -212,11 +212,11 @@
return;
}
- if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && activityline != PlayerDatas.Instance.baseData.FBID)//鍐嶅墠鍥涚珷鏂版墜鍦板浘涓斾笉鍦ㄦ椿鍔ㄥ尯鍩�
- {
- SysNotifyMgr.Instance.ShowTip("Map_AtkType");
- return;
- }
+ //if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && activityline != PlayerDatas.Instance.baseData.FBID)//鍐嶅墠鍥涚珷鏂版墜鍦板浘涓斾笉鍦ㄦ椿鍔ㄥ尯鍩�
+ //{
+ // SysNotifyMgr.Instance.ShowTip("Map_AtkType");
+ // return;
+ //}
WindowCenter.Instance.Open<CombatModeWin>();
if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
--
Gitblit v1.8.0