| Core/GameEngine/Model/Player/PlayerDatas.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0431_tagTimeTick.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/CrossServerRewardModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -34,7 +34,8 @@ public PlayerRankData rank { get { return m_Rank; } } StoreModel m_StoreModel; StoreModel StoreModel { StoreModel StoreModel { get { return m_StoreModel ?? (m_StoreModel = ModelCenter.Instance.GetModel<StoreModel>()); } } @@ -448,22 +449,45 @@ case PlayerDataRefresh.BillboardLV: break; case PlayerDataRefresh.Tick: #if UNITY_EDITOR DebugEx.LogFormat("---- 收到服务端Tick: {0}", value); if (extersion.Tick != 0) if (GameNetSystem.Instance.crossServerSocketConnected) { uint _curWorldTick = GetWorldTick(); uint _diffValue = value > _curWorldTick ? value - _curWorldTick : _curWorldTick - value; DebugEx.LogFormat(" |-------- 当前客户端Tick: {0}, 差异: {1}", _curWorldTick, _diffValue); if (_diffValue > 5000) if (!isMainServerData) { DebugEx.LogFormat(" |-------- <color=red>收到服务端WorldTick与当前的客户端Tick差异超过5秒</color>"); #if UNITY_EDITOR DebugEx.LogFormat("---- 收到服务端Tick: {0}", value); if (extersion.Tick != 0) { uint _curWorldTick = GetWorldTick(); uint _diffValue = value > _curWorldTick ? value - _curWorldTick : _curWorldTick - value; DebugEx.LogFormat(" |-------- 当前客户端Tick: {0}, 差异: {1}", _curWorldTick, _diffValue); if (_diffValue > 5000) { DebugEx.LogFormat(" |-------- <color=red>收到服务端WorldTick与当前的客户端Tick差异超过5秒</color>"); } } #endif extersion.Tick = value; m_Tick = Environment.TickCount; } } else { #if UNITY_EDITOR DebugEx.LogFormat("---- 收到服务端Tick: {0}", value); if (extersion.Tick != 0) { uint _curWorldTick = GetWorldTick(); uint _diffValue = value > _curWorldTick ? value - _curWorldTick : _curWorldTick - value; DebugEx.LogFormat(" |-------- 当前客户端Tick: {0}, 差异: {1}", _curWorldTick, _diffValue); if (_diffValue > 5000) { DebugEx.LogFormat(" |-------- <color=red>收到服务端WorldTick与当前的客户端Tick差异超过5秒</color>"); } } #endif extersion.Tick = value; m_Tick = Environment.TickCount; extersion.Tick = value; m_Tick = Environment.TickCount; } break; case PlayerDataRefresh.CurrentPlayerType: break; @@ -514,7 +538,7 @@ GameNetSystem.Instance.crossServerConnected_Loigc = false; LoadingWin.targetMapResId = 1; WindowCenter.Instance.Open<LoadingWin>(); StageManager.Instance.Load<DungeonStage>(baseData.MapID,GameNetSystem.SocketType.Main, true); StageManager.Instance.Load<DungeonStage>(baseData.MapID, GameNetSystem.SocketType.CrossSever, true); if (hero != null && !hero.ActorInfo.serverDie) { hero.RequestName(); Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs
@@ -24,7 +24,10 @@ DEBUG_0102 = true; DTC0403_tagPlayerLoginLoadOK.finishedLogin = false; DEBUG_STEP = 0; DTC0403_tagPlayerLoginLoadOK.neverLoginOk = true; if (vNetData.socketType == GameNetSystem.SocketType.Main) { DTC0403_tagPlayerLoginLoadOK.neverLoginOk = true; } MapTransferUtility.Instance.lastMoveToWorldBossTime = float.MinValue; MapTransferUtility.Instance.lastMoveToWorldBossNpcID = 0; Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs
@@ -32,7 +32,7 @@ switch (vNetData.socketType) { case GameNetSystem.SocketType.Main: if (loginModel.reconnectBackGround || PlayerDatas.Instance.baseData.ExAttr5 == 1) if (loginModel.reconnectBackGround || StageManager.Instance.socketType != GameNetSystem.SocketType.Main) { var mapOk = new C0107_tagCInitMapOK(); mapOk.MapID = PlayerDatas.Instance.baseData.MapID; @@ -41,7 +41,7 @@ } break; case GameNetSystem.SocketType.CrossSever: if (loginModel.reconnectBackGround) if (loginModel.reconnectBackGround || StageManager.Instance.socketType != GameNetSystem.SocketType.CrossSever) { var mapOk = new C0107_tagCInitMapOK(); mapOk.MapID = PlayerDatas.Instance.baseData.MapID; Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0431_tagTimeTick.cs
@@ -26,8 +26,7 @@ WindowCenter.Instance.Open<BattlePrepareCoolDownWin>(); } break; case CrossServerOneVsOneModel.CrossServerDataMapId: WindowCenter.Instance.CloseImmediately<DungeonEndCoolDownWin>(); case CrossServerOneVsOneModel.CrossServerDataMapId: if (!WindowCenter.Instance.IsOpen<BattlePrepareCoolDownWin>()) { WindowCenter.Instance.Open<BattlePrepareCoolDownWin>(); @@ -38,6 +37,7 @@ switch (mapId) { case CrossServerOneVsOneModel.CrossServerDataMapId: WindowCenter.Instance.CloseImmediately<DungeonEndCoolDownWin>(); WindowCenter.Instance.CloseImmediately<DungeonBeginCoolDownWin>(); break; } System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -325,7 +325,7 @@ UpdatePkResultEvent(); } } PlayerBuffDatas buffDatas { get { return ModelCenter.Instance.GetModel<PlayerBuffDatas>(); } } /// <summary> ///0-取消匹配; 1-进行匹配 /// </summary> @@ -337,6 +337,7 @@ CC101_tagCMCrossRealmPKMatch match = new CC101_tagCMCrossRealmPKMatch(); match.Type = (byte)type; GameNetSystem.Instance.SendInfo(match); CrossServerRewardModel.PkType = buffDatas.PkType; } public void SendBuyMatchCount() System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -345,7 +345,7 @@ { var match = new CC104_tagCMExitCrossRealm(); GameNetSystem.Instance.SendToCrossServer(match); SetPkType(); } private static int pkDanLvNow = 0; @@ -397,6 +397,18 @@ redPointStre2.state = RedPointState.None; } } private static int m_PkType = 0; public static int PkType { get { return m_PkType; } set { m_PkType = value; } } private static void SetPkType() { DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)m_PkType); } }
