From b8bcfae71df34b7b422dd59741e1e9c0358e4142 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 10 一月 2019 18:02:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainInterfaceWin.cs | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 65c0e54..b0ab69d 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -328,6 +328,11 @@
var bosses = ModelCenter.Instance.GetModel<DogzDungeonModel>().GetBosses();
m_BossBriefInfos.Display(bosses);
}
+ else if (PlayerDatas.Instance.baseData.MapID == CrossServerBossModel.DATA_MAPID)
+ {
+ var bosses = ModelCenter.Instance.GetModel<CrossServerBossModel>().GetBosses();
+ m_BossBriefInfos.Display(bosses);
+ }
else
{
var bosses = ModelCenter.Instance.GetModel<WorldBossModel>().GetWorldBosses(PlayerDatas.Instance.baseData.MapID);
@@ -457,7 +462,7 @@
m_RedpackGetSfx.StopImediatly();
}
var requireRedpack = (OSEnvelopeModel.CanGetEnvelope()
- || redPacket.IsRedBagGetBool) && PlayerDatas.Instance.baseData.ExAttr5 != 1;
+ || redPacket.IsRedBagGetBool) && !CrossServerUtility.IsCrossServer();
if (requireRedpack)
{
m_RedBag.gameObject.SetActive(true);
@@ -568,8 +573,8 @@
bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
int Line = 0;
fairyGrabBossModel.TryGetFairyGrabBossLine(out Line);
- if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && Line== PlayerDatas.Instance.baseData.FBID)
- {
+ if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && Line == PlayerDatas.Instance.baseData.FBID)
+ {
DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)0);
onMainModel.AreaState = Buffmodel.PkType;
return;
@@ -577,7 +582,7 @@
}
if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && Line != PlayerDatas.Instance.baseData.FBID)//閫嶉仴鍩庢櫘閫欱oss鍖哄煙澶勭悊
{
-
+
DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
onMainModel.AreaState = Buffmodel.PkType;
return;
@@ -726,7 +731,7 @@
private void UpdateDungeonAssistImag()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1)
+ if (CrossServerUtility.IsCrossServer())
{
DungeonAssistImg.gameObject.SetActive(false);
return;
@@ -736,7 +741,7 @@
private void UpdateMysticalPurchaseImag()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1)
+ if (CrossServerUtility.IsCrossServer())
{
MysticalPurchaseImg.gameObject.SetActive(false);
return;
@@ -746,7 +751,7 @@
private void UpdateWishAwardImag()
{
- if(PlayerDatas.Instance.baseData.ExAttr5 == 1)
+ if (CrossServerUtility.IsCrossServer())
{
WishingAwardImg.gameObject.SetActive(false);
return;
@@ -1168,8 +1173,7 @@
private void IsShowTaskPanel()//鏄惁鏄剧ず浠诲姟闈㈡澘
{
var inDungeon = IsDungeon();
- var IsCrossServerOneVsOne = PlayerDatas.Instance.baseData.ExAttr5 == 1;
- if (inDungeon || fairyGrabBossModel.grabBossHintOpen || IsCrossServerOneVsOne)
+ if (inDungeon || fairyGrabBossModel.grabBossHintOpen || CrossServerUtility.IsCrossServer())
{
m_TaskAndTeamTip.SetActive(false);
m_TaskSwithButton.gameObject.SetActive(false);
@@ -1296,7 +1300,7 @@
private void IsCrossServerOneVsOne()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//鏄惁鍐嶈法鏈嶅壇鏈腑
+ if (CrossServerUtility.IsCrossServerOneVsOne())//鏄惁鍐嶈法鏈嶅壇鏈腑
{
WindowCenter.Instance.Open<FightingPKWin>();
m_HeadPortraitTip.gameObject.SetActive(false);
--
Gitblit v1.8.0