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/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index a450329..daf61d6 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -14,7 +14,7 @@
{
public string PkResultLocalSaveKey { get; private set; }
public List<CrossServerOneVsOnePkResult> localSaveResults { get; private set; }
- CrossServerRewardModel rewardModel { get { return ModelCenter.Instance.GetModel<CrossServerRewardModel>(); } }
+ CrossServerOneVsOneRewardModel rewardModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>(); } }
public event Action UpdateDayAwardsEvent;
public const int CrossServerDataMapId = 32010;
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
@@ -168,7 +168,7 @@
private void UpdateFBHelp()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 != 1) return;
+ if (!CrossServerUtility.IsCrossServer()) return;
var hero = PlayerDatas.Instance.hero;
var mission = dungeonModel.mission;
@@ -422,7 +422,7 @@
CC101_tagCMCrossRealmPKMatch match = new CC101_tagCMCrossRealmPKMatch();
match.Type = (byte)type;
GameNetSystem.Instance.SendInfo(match);
- CrossServerRewardModel.PkType = buffDatas.PkType;
+ CrossServerOneVsOneRewardModel.PkType = buffDatas.PkType;
}
public void SendBuyMatchCount()
@@ -434,7 +434,7 @@
public bool TryGetMatchTip()
{
int mapId = PlayerDatas.Instance.baseData.MapID;
- bool isCrossDungeon = PlayerDatas.Instance.baseData.ExAttr5 == 1;
+ bool isCrossDungeon = CrossServerUtility.IsCrossServer();
if(isCrossDungeon)
{
SysNotifyMgr.Instance.ShowTip("CrossMatching3");
--
Gitblit v1.8.0