From 1dcd5d2a3b2fcf9b27c21581f4cec324e3473eba Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 17 八月 2018 15:01:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/FindPrecious/DemonJarModel.cs | 2 +-
System/Welfare/WelfareCenter.cs | 4 ++--
System/Team/TeamModel.cs | 16 +++++++++-------
System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | 4 ++--
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/System/FindPrecious/DemonJarModel.cs b/System/FindPrecious/DemonJarModel.cs
index ead4148..225ced0 100644
--- a/System/FindPrecious/DemonJarModel.cs
+++ b/System/FindPrecious/DemonJarModel.cs
@@ -359,7 +359,7 @@
}
}
- if (_bossId != 0 && !this.findPreciousModel.IsBossNeverSubscribe((int)_bossId))
+ if (_bossId != 0 && this.findPreciousModel.IsBossNeverSubscribe((int)_bossId))
{
var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>((int)_bossId);
if (PlayerDatas.Instance.baseData.LV >= npcConfig.NPCLV)
diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index 61fbdee..f140981 100644
--- a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
+++ b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -457,7 +457,7 @@
{
if (isPlayerUIeffect.RedPointId == 201 || isPlayerUIeffect.RedPointId == 210)
{
- if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.Simple)
+ if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.GetReward)
{
m_GroupIndex_Low.GetChild(i).GetComponent<HighBtnRecord>().IsNagaaki = true;
highBtnRecord.IsNagaaki = true;
@@ -500,7 +500,7 @@
{
if (isPlayerUIeffect.RedPointId == 201 || isPlayerUIeffect.RedPointId == 210)
{
- if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.Simple)
+ if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.GetReward)
{
m_GroupIndex_Low.GetChild(i).GetComponent<HighBtnRecord>().IsNagaaki = true;
highBtnRecord.IsNagaaki = true;
diff --git a/System/Team/TeamModel.cs b/System/Team/TeamModel.cs
index de67d5d..ded05e6 100644
--- a/System/Team/TeamModel.cs
+++ b/System/Team/TeamModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- public class TeamModel : Model, IAfterPlayerDataInitialize, ISwitchAccount, IPlayerLoginOk
+ public class TeamModel : Model, IAfterPlayerDataInitialize, ISwitchAccount, IPlayerLoginOk, IMapInitOk
{
public const int NONE_MISSION = 0;
public const int CURRENTMAP_MISSION = 1;
@@ -1100,12 +1100,6 @@
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()
@@ -1131,6 +1125,14 @@
moveToNPCRecord = 0;
}
+ public void OnMapInitOk()
+ {
+ var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ if (mapConfig != null && mapConfig.MapFBType == (int)MapType.OpenCountry)
+ {
+ lastOpenCountryMapRecorder = PlayerDatas.Instance.baseData.MapID;
+ }
+ }
}
}
diff --git a/System/Welfare/WelfareCenter.cs b/System/Welfare/WelfareCenter.cs
index e25e448..fc49aec 100644
--- a/System/Welfare/WelfareCenter.cs
+++ b/System/Welfare/WelfareCenter.cs
@@ -66,7 +66,7 @@
if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)
{
WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<WelfareWin>(false, 8);
+ WindowCenter.Instance.Open<WelfareWin>(false, 5);
return;
}
WindowCenter.Instance.Close<MainInterfaceWin>();
@@ -112,7 +112,7 @@
if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)
{
- return 8;
+ return 5;
}
return functionOrder;
}
--
Gitblit v1.8.0