Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -134,7 +134,7 @@ godWeaponLV_3 = (int)_serverInfo.ExAttr17; godWeaponLV_4 = (int)_serverInfo.ExAttr18; if (Snxxz.UI.CrossServerOneVsOneModel.IsCrossServerOneVsOne()) if (CrossServerUtility.IsCrossServer()) { if (_serverInfo.socketType == GameNetSystem.SocketType.CrossSever) { @@ -149,7 +149,7 @@ if (PlayerDatas.Instance.hero != null) { PlayerDatas.Instance.hero.ActorInfo.familyID = Family; if (Snxxz.UI.CrossServerOneVsOneModel.IsCrossServerOneVsOne()) if (CrossServerUtility.IsCrossServer()) { if (_serverInfo.socketType == GameNetSystem.SocketType.CrossSever) { Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
@@ -38,7 +38,7 @@ if ((PlayerDataRefresh)vNetData.RefreshType == PlayerDataRefresh.HP) { bool _sync = false; if (CrossServerOneVsOneModel.IsCrossServerOneVsOne()) if (CrossServerUtility.IsCrossServer()) { if (vNetData.socketType == GameNetSystem.SocketType.CrossSever) { Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
@@ -472,7 +472,7 @@ #endif // 跨服竞技场不检测反击逻辑 if(CrossServerOneVsOneModel.IsCrossServerOneVsOne()) if(CrossServerUtility.IsCrossServerOneVsOne()) { return; } Core/NetworkPackage/DTCFile/ServerPack/HA7_Arena/DTCA709_tagObjInfoListRefresh.cs
@@ -27,7 +27,7 @@ if (objId == PlayerDatas.Instance.PlayerId) { if (Snxxz.UI.CrossServerOneVsOneModel.IsCrossServerOneVsOne()) if (CrossServerUtility.IsCrossServer()) { if (vNetDatas.socketType == GameNetSystem.SocketType.CrossSever) { Core/NetworkPackage/DTCFile/ServerPack/HA7_Interaction/DTCA713_tagMCDynamicBarrierState.cs
@@ -100,7 +100,7 @@ int _effectID = 1040; if(Snxxz.UI.CrossServerOneVsOneModel.IsCrossServerOneVsOne()) if(CrossServerUtility.IsCrossServer()) { _effectID = 5206; } Fight/Actor/AI/HeroAI_D5_Hlyy.cs
@@ -39,7 +39,7 @@ string _chkKey = (PlayerDatas.Instance.baseData.MapID * 100 + PlayerDatas.Instance.baseData.dungeonLineId).ToString(); if (Snxxz.UI.CrossServerOneVsOneModel.IsCrossServerOneVsOne()) if (CrossServerUtility.IsCrossServer()) { _chkKey = (PlayerDatas.Instance.baseData.MapID * 100).ToString(); } @@ -108,7 +108,7 @@ // 未到达路点则寻路至路点 if (_chkDistSqrt > .25f) { _hero.MoveToPosition(m_PointList[m_Index], 0, Snxxz.UI.CrossServerOneVsOneModel.IsCrossServerOneVsOne()); _hero.MoveToPosition(m_PointList[m_Index], 0, CrossServerUtility.IsCrossServer()); } // 到达路点就去往下一个路点 else Fight/GameActor/GA_Hero.cs
@@ -328,7 +328,7 @@ #if UNITY_EDITOR && RuntimeLogUtility.s_forceAutoFight #endif && !CrossServerOneVsOneModel.IsCrossServerOneVsOne()) && !CrossServerUtility.IsCrossServer()) { if (!aiHandler.IsAuto() && !BossShowModel.Instance.BossShowing) { Fight/Stage/Dungeon/DungeonStage.cs
@@ -101,7 +101,7 @@ WindowCenter.Instance.Open<AntiAddictionWin>(); } if (CrossServerOneVsOneModel.IsCrossServerOneVsOne()) if (CrossServerUtility.IsCrossServer()) { _hero.SkillMgr.ResetAllCD(); } System/CrossServer.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: bb0295723b3e9fb4681333e248097405 folderAsset: yes timeCreated: 1546854019 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: System/CrossServer/CrossServerUtility.cs
New file @@ -0,0 +1,29 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using Snxxz.UI; public class CrossServerUtility { public static bool IsCrossServer() { return PlayerDatas.Instance.baseData.ExAttr5 == 1; } public static bool IsCrossServerOneVsOne() { var dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>(); var dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID); return PlayerDatas.Instance.baseData.ExAttr5 == 1 && dataMapId == CrossServerOneVsOneModel.CrossServerDataMapId; } public static bool IsCrossServerBoss() { var dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>(); var dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID); return PlayerDatas.Instance.baseData.ExAttr5 == 1 && dataMapId == CrossServerBossModel.DATA_MAPID; } } System/CrossServer/CrossServerUtility.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: a5a48fcf6258c9144878499021c783b8 timeCreated: 1546854095 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -98,13 +98,6 @@ } public static bool IsCrossServerOneVsOne()//是否再跨服副本中 { var dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>(); var dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID); return PlayerDatas.Instance.baseData.ExAttr5 == 1 && dataMapId== CrossServerDataMapId; } private void InitData() { CrossServerOneVsOnePKSeason.Instance.InitData(); System/Dungeon/DungeonFightWin.cs
@@ -75,7 +75,7 @@ m_Liquid.gameObject.SetActive(false); var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID); m_ExitDungeon.gameObject.SetActive(dataMapId != DemonJarModel.DEMONJAR_MAPID && !CrossServerOneVsOneModel.IsCrossServerOneVsOne()); && !CrossServerUtility.IsCrossServerOneVsOne()); m_ContainerAncient.gameObject.SetActive(dataMapId == 31160); m_BossInfosContainer.gameObject.SetActive( dataMapId == ElderGodAreaModel.ELDERGODAREA_MAPID System/Dungeon/TargetBriefInfoWin.cs
@@ -27,7 +27,7 @@ static void OnShowBossLifeBar(uint _instanceId, int _npcId, bool _show) { if (CrossServerOneVsOneModel.IsCrossServerOneVsOne() && _show) if (CrossServerUtility.IsCrossServerOneVsOne() && _show) { return; } @@ -70,7 +70,7 @@ static void OnRefreshBossLifeBar(uint _instanceId, int _npcId, ulong _hp, ulong _maxHp) { if (CrossServerOneVsOneModel.IsCrossServerOneVsOne()) if (CrossServerUtility.IsCrossServerOneVsOne()) { return; } @@ -115,7 +115,7 @@ static void OnShowPlayerLifeBar(uint _instanceId, bool _show) { if (CrossServerOneVsOneModel.IsCrossServerOneVsOne() && _show) if (CrossServerUtility.IsCrossServerOneVsOne() && _show) { return; } @@ -135,7 +135,7 @@ static void OnRefreshPlayerLifeBar(uint _instanceId, ulong _hp, ulong _maxHp) { if (CrossServerOneVsOneModel.IsCrossServerOneVsOne()) if (CrossServerUtility.IsCrossServerOneVsOne()) { return; } System/MainInterfacePanel/MainInterfaceWin.cs
@@ -1296,7 +1296,7 @@ private void IsCrossServerOneVsOne() { if (CrossServerOneVsOneModel.IsCrossServerOneVsOne())//是否再跨服副本中 if (CrossServerUtility.IsCrossServerOneVsOne())//是否再跨服副本中 { WindowCenter.Instance.Open<FightingPKWin>(); m_HeadPortraitTip.gameObject.SetActive(false);
