|
@@ -88,7 +88,6 @@ namespace CommonAI.ZoneClient
|
|
|
public string ClientResourceVersion { get { return Templates.ResourceVersion; } }
|
|
|
|
|
|
private Logger log = LoggerFactory.GetLogger("ZoneClient");
|
|
|
- private long mLocalPassTimeMS = 0;
|
|
|
private long mRemotePassTimeMS = 0;
|
|
|
private SceneData mData;
|
|
|
private ZoneInfo mTerrainDataSrc;
|
|
@@ -137,22 +136,23 @@ namespace CommonAI.ZoneClient
|
|
|
protected virtual void InitSceneData(ClientEnterScene msg)
|
|
|
{
|
|
|
log.Debug("---------------------------------------InitSceneData---------------------------------");
|
|
|
- if (mData != null)
|
|
|
+ SceneData sdata;
|
|
|
+ if (mData == null)
|
|
|
{
|
|
|
- log.Error("### InitSceneData Error: mData not null");
|
|
|
- //Disposing();
|
|
|
- return;
|
|
|
+ sdata = DataRoot.LoadScene(msg.sceneID, false, true);
|
|
|
+ mData = sdata;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sdata = mData;
|
|
|
}
|
|
|
- var sdata = DataRoot.LoadScene(msg.sceneID, false, true);
|
|
|
if (sdata == null)
|
|
|
{
|
|
|
throw new Exception("Can not load scene data : " + msg.sceneID);
|
|
|
}
|
|
|
|
|
|
this.ServerResourceVersion = msg.resVersion;
|
|
|
- this.mData = sdata;
|
|
|
this.mTerrainDataSrc = sdata.ZoneData;
|
|
|
-
|
|
|
this.SpaceDivSize = msg.spaceDiv;
|
|
|
if (this.SpaceDivSize > 0)
|
|
|
{
|
|
@@ -267,6 +267,10 @@ namespace CommonAI.ZoneClient
|
|
|
public SceneData Data
|
|
|
{
|
|
|
get { return mData; }
|
|
|
+ set
|
|
|
+ {
|
|
|
+ mData = value;
|
|
|
+ }
|
|
|
}
|
|
|
public int SceneID
|
|
|
{
|
|
@@ -317,7 +321,7 @@ namespace CommonAI.ZoneClient
|
|
|
|
|
|
if (intervalMS > 0)
|
|
|
{
|
|
|
- this.mLocalPassTimeMS += intervalMS;
|
|
|
+ //this.mLocalPassTimeMS += intervalMS;
|
|
|
this.CurrentIntervalMS = intervalMS;
|
|
|
this.MinStep = MoveHelper.GetDistance(intervalMS, Templates.CFG.OBJECT_MOVE_TO_MIN_STEP_SEC);
|
|
|
this.mObjectes.ForEachObjectsDoUpdateAI();
|
|
@@ -460,7 +464,11 @@ namespace CommonAI.ZoneClient
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- log.Debug($"<<<layerEvent: {msg}");
|
|
|
+ if(!(msg is SyncPosEvent) && !(msg is UnitForceSyncPosEvent) && !(msg is LaunchSkill) && !(msg is AddSpellEvent) && !(msg is RemoveObjectEvent))
|
|
|
+ {
|
|
|
+ log.Debug($"<<<layerEvent: {msg}");
|
|
|
+ }
|
|
|
+
|
|
|
if (msg is ActorResponse)
|
|
|
{
|
|
|
var rsp = msg as ActorResponse;
|