From b8bcfae71df34b7b422dd59741e1e9c0358e4142 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 10 一月 2019 18:02:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/PlayerTaskDatas.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index 30506ea..531c199 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -132,8 +132,7 @@
public int TaskAutoLv = 0;
public int TaskAutoTime = 0;
PlayerPackModel _playerPack;
- PlayerPackModel playerPack
- {
+ PlayerPackModel playerPack {
get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); }
}
@@ -1239,10 +1238,8 @@
}
private PlayerPackModel m_PlayerBackModel;
- private PlayerPackModel PlayerBackModel
- {
- get
- {
+ private PlayerPackModel PlayerBackModel {
+ get {
return m_PlayerBackModel ?? (m_PlayerBackModel = ModelCenter.Instance.GetModel<PlayerPackModel>());
}
}
@@ -1308,6 +1305,12 @@
{
yield break;
}
+
+ if (CrossServerUtility.IsCrossServer())
+ {
+ yield break;
+ }
+
if (BountyDic.ContainsKey(_taskID) || FairyAuDic.ContainsKey(_taskID))
{
yield return WaitingForSecondConst.WaitMS800;//缂撳啿涓�绉掑啀杩涜
--
Gitblit v1.8.0