From 5df482a22d9b243cf92bc2d6826a294cff93daee Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 17 八月 2018 14:11:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Team/TeamModel.cs | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/System/Team/TeamModel.cs b/System/Team/TeamModel.cs
index 5dffb24..de67d5d 100644
--- a/System/Team/TeamModel.cs
+++ b/System/Team/TeamModel.cs
@@ -185,6 +185,8 @@
Redpoint invitationRedpoint = new Redpoint(28);
Redpoint memberCountRedpoint = new Redpoint(34);
+ int lastOpenCountryMapRecorder = 0;
+
public override void Init()
{
levelMaxBuf = GeneralConfig.Instance.playerMaxLevel;
@@ -205,6 +207,7 @@
public void OnSwitchAccount()
{
+ lastOpenCountryMapRecorder = 0;
m_CurrentMission = new TeamMission(CURRENTMAP_MISSION, 0);
m_MissionBuf = new TeamMission(CURRENTMAP_MISSION, 0);
m_MyTeam = new MyTeam();
@@ -336,7 +339,7 @@
var lineId = 0;
if (myTeam.mission.mapId == CURRENTMAP_MISSION || myTeam.mission.mapId == NONE_MISSION)
{
- mapId = PlayerDatas.Instance.baseData.MapID;
+ mapId = lastOpenCountryMapRecorder == 0 ? PlayerDatas.Instance.baseData.MapID : lastOpenCountryMapRecorder;
lineId = 0;
}
else
@@ -1097,6 +1100,12 @@
public void OnPlayerLoginOk()
{
serverInited = true;
+
+ var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ if (mapConfig != null && mapConfig.MapFBType == (int)MapType.OpenCountry)
+ {
+ lastOpenCountryMapRecorder = PlayerDatas.Instance.baseData.MapID;
+ }
}
private void OnMatchingCoolDownEnd()
--
Gitblit v1.8.0