From 6327478d6e13084a11241c78f5c0c6e09a037ca8 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 27 十二月 2018 17:33:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Player/PlayerDatas.cs | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/Core/GameEngine/Model/Player/PlayerDatas.cs b/Core/GameEngine/Model/Player/PlayerDatas.cs
index c6b59a6..8043386 100644
--- a/Core/GameEngine/Model/Player/PlayerDatas.cs
+++ b/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("---- 鏀跺埌鏈嶅姟绔疶ick: {0}", value);
-
- if (extersion.Tick != 0)
+ if (GameNetSystem.Instance.crossServerSocketConnected)
{
- uint _curWorldTick = GetWorldTick();
- uint _diffValue = value > _curWorldTick ? value - _curWorldTick : _curWorldTick - value;
- DebugEx.LogFormat(" |-------- 褰撳墠瀹㈡埛绔疶ick: {0}, 宸紓: {1}", _curWorldTick, _diffValue);
- if (_diffValue > 5000)
+ if (!isMainServerData)
{
- DebugEx.LogFormat(" |-------- <color=red>鏀跺埌鏈嶅姟绔疻orldTick涓庡綋鍓嶇殑瀹㈡埛绔疶ick宸紓瓒呰繃5绉�</color>");
+#if UNITY_EDITOR
+ DebugEx.LogFormat("---- 鏀跺埌鏈嶅姟绔疶ick: {0}", value);
+ if (extersion.Tick != 0)
+ {
+ uint _curWorldTick = GetWorldTick();
+ uint _diffValue = value > _curWorldTick ? value - _curWorldTick : _curWorldTick - value;
+ DebugEx.LogFormat(" |-------- 褰撳墠瀹㈡埛绔疶ick: {0}, 宸紓: {1}", _curWorldTick, _diffValue);
+ if (_diffValue > 5000)
+ {
+ DebugEx.LogFormat(" |-------- <color=red>鏀跺埌鏈嶅姟绔疻orldTick涓庡綋鍓嶇殑瀹㈡埛绔疶ick宸紓瓒呰繃5绉�</color>");
+ }
+ }
+#endif
+ extersion.Tick = value;
+ m_Tick = Environment.TickCount;
}
}
+ else
+ {
+#if UNITY_EDITOR
+ DebugEx.LogFormat("---- 鏀跺埌鏈嶅姟绔疶ick: {0}", value);
+ if (extersion.Tick != 0)
+ {
+ uint _curWorldTick = GetWorldTick();
+ uint _diffValue = value > _curWorldTick ? value - _curWorldTick : _curWorldTick - value;
+ DebugEx.LogFormat(" |-------- 褰撳墠瀹㈡埛绔疶ick: {0}, 宸紓: {1}", _curWorldTick, _diffValue);
+ if (_diffValue > 5000)
+ {
+ DebugEx.LogFormat(" |-------- <color=red>鏀跺埌鏈嶅姟绔疻orldTick涓庡綋鍓嶇殑瀹㈡埛绔疶ick宸紓瓒呰繃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();
--
Gitblit v1.8.0