Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -236,7 +236,7 @@ godWeaponLV_2 = (int)serverInfo.ExAttr16; godWeaponLV_3 = (int)serverInfo.ExAttr17; godWeaponLV_4 = (int)serverInfo.ExAttr18; HP = serverInfo.HP; if (PlayerDatas.Instance.hero != null) { PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)serverInfo.HP); Fight/Stage/Dungeon/DungeonStage.cs
@@ -186,7 +186,7 @@ private void OnEnterNormalDungeon() { if (PlayerDatas.Instance.baseData.ExAttr5 == 0) if (!CrossServerUtility.IsCrossServer()) { WindowCenter.Instance.Open<DungeonFightWin>(); } Lua/Gen/Resources.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: a545fb3dcf719304fa74180c10219375 folderAsset: yes timeCreated: 1542357825 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: System/CrossServerBoss/CrossServerBossModel.cs
@@ -89,12 +89,6 @@ FuncOpen.Instance.OnFuncStateChangeEvent -= OnFunctionStateChange; } public bool IsAtCrossServerBossMap() { return PlayerDatas.Instance.baseData.ExAttr5 == 1 && PlayerDatas.Instance.baseData.MapID == DATA_MAPID; } public void RequestEnter() { var sendInfo = new CC105_tagCMEnterCrossServer(); System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -168,7 +168,7 @@ private void UpdateFBHelp() { if (PlayerDatas.Instance.baseData.ExAttr5 != 1) return; if (!CrossServerUtility.IsCrossServer()) return; var hero = PlayerDatas.Instance.hero; var mission = dungeonModel.mission; @@ -434,7 +434,7 @@ public bool TryGetMatchTip() { int mapId = PlayerDatas.Instance.baseData.MapID; bool isCrossDungeon = PlayerDatas.Instance.baseData.ExAttr5 == 1; bool isCrossDungeon = CrossServerUtility.IsCrossServer(); if(isCrossDungeon) { SysNotifyMgr.Instance.ShowTip("CrossMatching3"); System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
@@ -146,7 +146,7 @@ private void UpdatePkResultEvent() { if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//副本结算界面 if (CrossServerUtility.IsCrossServer())//副本结算界面 { if (WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>()) { System/Dungeon/DungeonModel.cs
@@ -377,8 +377,7 @@ } } var crossServerBossModel = ModelCenter.Instance.GetModel<CrossServerBossModel>(); if (crossServerBossModel.IsAtCrossServerBossMap()) if (CrossServerUtility.IsCrossServerBoss()) { _error = 6; return false; System/FairyAu/FairyLeagueRemindBehaviour.cs
@@ -152,7 +152,7 @@ bool InCrossServer() { return PlayerDatas.Instance.baseData.ExAttr5 == 1; return CrossServerUtility.IsCrossServer(); } bool TryGetStartTime(out DateTime time) System/MainInterfacePanel/ChatFrame.cs
@@ -84,7 +84,7 @@ } } _FriendsBtn.gameObject.SetActive(crossServerBossModel.IsAtCrossServerBossMap()); _FriendsBtn.gameObject.SetActive(!CrossServerUtility.IsCrossServer()); } public void OnAfterOpen() @@ -134,7 +134,7 @@ private void MailCountChange() { if (PlayerDatas.Instance.baseData.ExAttr5 == 1) if (CrossServerUtility.IsCrossServer()) { _MailBtn.gameObject.SetActive(false); return; System/MainInterfacePanel/CoinTaskTipModel.cs
@@ -114,7 +114,7 @@ private IEnumerator PopupPanel() { yield return WaitingForSecondConst.WaitMS1500; if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//在跨服竞技场不打开 if (CrossServerUtility.IsCrossServer())//在跨服竞技场不打开 { yield break; } @@ -140,7 +140,7 @@ private IEnumerator FairyAuTaskPanel() { yield return WaitingForSecondConst.WaitMS1500; if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//在跨服竞技场不打开 if (CrossServerUtility.IsCrossServer())//在跨服竞技场不打开 { yield break; } System/MainInterfacePanel/MainInterfaceWin.cs
@@ -462,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); @@ -731,7 +731,7 @@ private void UpdateDungeonAssistImag() { if (PlayerDatas.Instance.baseData.ExAttr5 == 1) if (CrossServerUtility.IsCrossServer()) { DungeonAssistImg.gameObject.SetActive(false); return; @@ -741,7 +741,7 @@ private void UpdateMysticalPurchaseImag() { if (PlayerDatas.Instance.baseData.ExAttr5 == 1) if (CrossServerUtility.IsCrossServer()) { MysticalPurchaseImg.gameObject.SetActive(false); return; @@ -751,7 +751,7 @@ private void UpdateWishAwardImag() { if (PlayerDatas.Instance.baseData.ExAttr5 == 1) if (CrossServerUtility.IsCrossServer()) { WishingAwardImg.gameObject.SetActive(false); return; @@ -1173,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); System/SystemSetting/SettingEffectMgr.cs
@@ -225,7 +225,7 @@ /// </summary> private void AutoDrugSetting() { if (PlayerDatas.Instance.baseData.ExAttr5 == 1) return; if (CrossServerUtility.IsCrossServerOneVsOne()) return; float hpPercent = Mathf.RoundToInt((float)PlayerDatas.Instance.baseData.HP / PlayerDatas.Instance.extersion.MaxHP * 100); if (hpPercent <= HangUpSetModel.Instance.GetHpSet()) System/Team/TeamInvitationEntrance.cs
@@ -36,7 +36,7 @@ private void OnInvitationsChange() { if (PlayerDatas.Instance.baseData.ExAttr5 == 1) if (CrossServerUtility.IsCrossServer()) { m_Invitations.gameObject.SetActive(false); }
